Merge pull request #2 from shankari/master

Rename the base app to emTripLog

Author: shankari

config.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget android-versionCode="1" id="edu.berkeley.eecs.embase" ios-CFBundleVersion="1" version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
-    <name>e²mission</name>
+<widget android-versionCode="2" id="edu.berkeley.eecs.embase" ios-CFBundleVersion="2" version="1.0.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+    <name>emTripLog</name>
     <description>
         Base version of the e-mission app, intended for customization by studies.
     </description>

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "edu.berkeley.eecs.emission",
-  "version": "2.5.0",
-  "displayName": "e²mission",
+  "name": "edu.berkeley.eecs.embase",
+  "version": "1.0.1",
+  "displayName": "emTripLog",
   "cordova": {
     "platforms": [
       "ios",
@@ -61,7 +61,6 @@
     "edu.berkeley.eecs.emission.cordova.settings": "https://github.com/e-mission/cordova-connection-settings.git",
     "edu.berkeley.eecs.emission.cordova.unifiedlogger": "https://github.com/e-mission/cordova-unified-logger.git",
     "edu.berkeley.eecs.emission.cordova.usercache": "https://github.com/e-mission/cordova-usercache.git",
-    "em-cordova-connection-settings": "file:../e-mission-transition-notify",
     "em-cordova-transition-notify": "git+https://github.com/e-mission/e-mission-transition-notify.git",
     "fs-extra": "^5.0.0",
     "ionic-plugin-keyboard": "~2.2.1",