fix(merge) Fixes after merging various changes

LesionTracker/.meteor/packages

@@ -6,24 +6,24 @@
 
 npm-bcrypt@0.9.3
 
-meteor-base@1.2.0             # Packages every Meteor app needs to have
+meteor-base@1.4.0             # Packages every Meteor app needs to have
 mobile-experience@1.0.5       # Packages for a great mobile UX
-mongo@1.3.0                  # The database Meteor supports right now
+mongo@1.5.0                  # The database Meteor supports right now
 blaze-html-templates@1.0.4    # Compile .html files into Meteor Blaze views
 session@1.1.7                 # Client-side reactive dictionary for your app
 jquery@1.11.10                 # Helpful client-side library
-tracker@1.1.3                 # Meteor's client-side reactive programming library
-standard-minifier-css@1.3.5
-standard-minifier-js@2.2.0
-http@1.3.0
-promise@0.10.0
+tracker@1.2.0                 # Meteor's client-side reactive programming library
+standard-minifier-css@1.4.1
+standard-minifier-js@2.3.4
+http@1.4.1
+promise@0.11.1
 stylus@2.513.13
-random@1.0.10
+random@1.1.0
 reactive-var@1.0.11
 reactive-dict@1.2.0
-check@1.2.5
+check@1.3.1
 email@1.2.3
-ecmascript@0.9.0              # Enable ECMAScript2015+ syntax in app code
+ecmascript@0.11.1              # Enable ECMAScript2015+ syntax in app code
 
 clinical:active-entry
 clinical:theming
@@ -51,8 +51,8 @@ ohif:user
 ohif:user-management
 ohif:select-tree
 
-accounts-base@1.4.0
-accounts-password@1.5.0
+accounts-base@1.4.2
+accounts-password@1.5.1
 
 fortawesome:fontawesome
 momentjs:moment@2.15.1
@@ -62,4 +62,5 @@ aldeed:collection2
 zuuk:stale-session
 johdirr:meteor-git-rev
 cultofcoders:persistent-session@0.4.4
-shell-server@0.3.0
+shell-server@0.3.1
+underscore