Feature/meteor update

.meteor/.finished-upgraders

@@ -0,0 +1,12 @@
+# This file contains information which helps Meteor properly upgrade your
+# app when you run 'meteor update'. You should check it into version control
+# with your project.
+
+notices-for-0.9.0
+notices-for-0.9.1
+0.9.4-platform-file
+notices-for-facebook-graph-api-2
+1.2.0-standard-minifiers-package
+1.2.0-meteor-platform-split
+1.2.0-cordova-changes
+1.2.0-breaking-changes

.meteor/cordova-plugins

@@ -1 +0,0 @@
-

.meteor/packages

@@ -3,7 +3,6 @@
 # 'meteor add' and 'meteor remove' will edit this file for you,
 # but you can also edit it by hand.
 
-meteor-platform
 less
 accounts-base
 accounts-password
@@ -20,7 +19,6 @@ yogiben:helpers
 iron:router
 yogiben:autoform-modals
 yogiben:pretty-email
-yogiben:autoform-file
 yogiben:autoform-map
 multiply:iron-router-progress
 manuelschoebel:ms-seo
@@ -50,7 +48,6 @@ percolate:synced-cron
 twbs:bootstrap
 reactive-var
 meteorhacks:npm
-npm-container
 aldeed:tabular
 benmgreene:moment-range
 frenchbread:elastic-rest
@@ -69,3 +66,21 @@ mizzao:sharejs-ace
 raix:ui-dropped-event
 brylie:accounts-admin-ui
 brylie:first-user-admin
+
+
+npm-container
+standard-minifiers
+meteor-base
+mobile-experience
+mongo
+blaze-html-templates
+session
+jquery
+tracker
+logging
+reload
+random
+ejson
+spacebars
+check
+useraccounts:iron-routing

.meteor/release

@@ -1 +1 @@
-METEOR@1.1.0.2
+METEOR@1.2.0.2

.meteor/versions

@@ -1,30 +1,35 @@
-accounts-base@1.2.0
-accounts-github@1.0.4
-accounts-oauth@1.1.5
-accounts-password@1.1.1
-accounts-ui@1.1.5
-accounts-ui-unstyled@1.1.7
-alanning:roles@1.2.13
-aldeed:autoform@5.3.1
-aldeed:collection2@2.3.3
+accounts-base@1.2.1
+accounts-github@1.0.6
+accounts-oauth@1.1.7
+accounts-password@1.1.3
+accounts-ui@1.1.6
+accounts-ui-unstyled@1.1.8
+alanning:roles@1.2.14
+aldeed:autoform@5.6.0
+aldeed:collection2@2.5.0
 aldeed:simple-schema@1.3.3
-aldeed:tabular@1.2.0
+aldeed:tabular@1.4.1
 aldeed:template-extension@3.4.3
-autoupdate@1.2.1
-base64@1.0.3
+autoupdate@1.2.3
+babel-compiler@5.8.24_1
+babel-runtime@0.1.4
+base64@1.0.4
 benmgreene:moment-range@1.0.7
 bevanhunt:leaflet@0.3.18
-binary-heap@1.0.3
-blaze@2.1.2
-blaze-tools@1.0.3
-boilerplate-generator@1.0.3
+binary-heap@1.0.4
+blaze@2.1.3
+blaze-html-templates@1.0.1
+blaze-tools@1.0.4
+boilerplate-generator@1.0.4
 bruz:github-api@0.2.4_1
 brylie:accounts-admin-ui@0.3.0
 brylie:api-umbrella@0.2.12
 brylie:create-role-if-undefined@0.1.0
 brylie:first-user-admin@0.1.9
 brylie:leaflet-heat@0.1.0
-callback-hook@1.0.3
+caching-compiler@1.0.0
+caching-html-compiler@1.0.2
+callback-hook@1.0.4
 cfs:access-point@0.1.49
 cfs:base-package@0.0.30
 cfs:collection@0.5.5
@@ -33,7 +38,7 @@ cfs:data-man@0.0.6
 cfs:file@0.1.17
 cfs:filesystem@0.1.2
 cfs:gridfs@0.0.33
-cfs:http-methods@0.0.29
+cfs:http-methods@0.0.30
 cfs:http-publish@0.0.13
 cfs:power-queue@0.9.11
 cfs:reactive-list@0.0.9
@@ -44,114 +49,130 @@ cfs:tempstore@0.1.5
 cfs:upload-http@0.0.20
 cfs:worker@0.1.4
 chart:chart@1.0.1-beta.4
-check@1.0.5
+check@1.0.6
 cmather:handlebars-server@2.0.0
-coffeescript@1.0.6
-dapearce:material-icons@0.1.2
+coffeescript@1.0.10
+dapearce:material-icons@0.1.3
 dburles:collection-helpers@1.0.3
-dburles:google-maps@1.1.1
-ddp@1.1.0
-deps@1.0.7
-ejson@1.0.6
-email@1.0.6
-fastclick@1.0.3
-fortawesome:fontawesome@4.3.0
+dburles:google-maps@1.1.4
+ddp@1.2.2
+ddp-client@1.2.1
+ddp-common@1.2.1
+ddp-rate-limiter@1.0.0
+ddp-server@1.2.1
+deps@1.0.9
+diff-sequence@1.0.1
+ecmascript@0.1.5
+ecmascript-collections@0.1.6
+ejson@1.0.7
+email@1.0.7
+fastclick@1.0.7
+fortawesome:fontawesome@4.4.0
 frenchbread:dynatable@0.1.0
 frenchbread:elastic-rest@0.2.0
-geojson-utils@1.0.3
-github@1.1.3
-handlebars@1.0.3
-html-tools@1.0.4
-htmljs@1.0.4
-http@1.1.0
-id-map@1.0.3
+geojson-utils@1.0.4
+github@1.1.4
+handlebars@1.0.4
+hot-code-push@1.0.0
+html-tools@1.0.5
+htmljs@1.0.5
+http@1.1.1
+id-map@1.0.4
+idorecall:email-normalize@1.0.0
 iron:controller@1.0.8
 iron:core@1.0.8
 iron:dynamic-template@1.0.8
 iron:layout@1.0.8
 iron:location@1.0.9
-iron:middleware-stack@1.0.9
-iron:router@1.0.9
+iron:middleware-stack@1.0.10
+iron:router@1.0.10
 iron:url@1.0.9
 jparker:crypto-core@0.1.0
 jparker:crypto-md5@0.1.1
-jparker:gravatar@0.3.1
-jquery@1.11.3_2
-json@1.0.3
-juliancwirko:s-alert@2.4.1
-juliancwirko:s-alert-stackslide@1.1.3
-launch-screen@1.0.2
-less@1.0.14
-livedata@1.0.13
-localstorage@1.0.3
-logging@1.0.7
+jparker:gravatar@0.4.1
+jquery@1.11.4
+juliancwirko:s-alert@2.4.2
+juliancwirko:s-alert-stackslide@1.1.4
+launch-screen@1.0.4
+less@2.5.0_3
+livedata@1.0.15
+localstorage@1.0.5
+logging@1.0.8
 manuelschoebel:ms-seo@0.4.1
-matb33:collection-hooks@0.7.13
-meteor@1.1.6
-meteor-platform@1.2.2
+matb33:collection-hooks@0.8.1
+meteor@1.1.9
+meteor-base@1.0.1
+meteor-platform@1.2.3
 meteorhacks:async@1.0.0
-meteorhacks:npm@1.3.0
-meteorhacks:subs-manager@1.4.0
+meteorhacks:npm@1.5.0
+meteorhacks:subs-manager@1.6.2
 meteorspark:util@0.2.0
 mfactory:admin-lte@0.0.2
-minifiers@1.1.5
-minimongo@1.0.8
-mizzao:sharejs@0.7.4
-mizzao:sharejs-ace@1.1.8_1
-mobile-status-bar@1.0.3
-momentjs:moment@2.10.3
-mongo@1.1.0
-mongo-livedata@1.0.8
+minifiers@1.1.7
+minimongo@1.0.10
+mizzao:sharejs@0.7.5
+mizzao:sharejs-ace@1.2.0
+mobile-experience@1.0.1
+mobile-status-bar@1.0.6
+momentjs:moment@2.10.6
+mongo@1.1.2
+mongo-id@1.0.1
+mongo-livedata@1.0.9
 mpowaga:string-template@0.1.0
 mrt:flash-messages@1.0.1
-multiply:iron-router-progress@1.0.1
-natestrauser:animate-css@3.2.6
+multiply:iron-router-progress@1.0.2
+natestrauser:animate-css@3.4.0
 npm-bcrypt@0.7.8_2
-npm-container@1.0.0
-oauth@1.1.4
-oauth2@1.1.3
-observe-sequence@1.0.6
-ordered-dict@1.0.3
-percolate:synced-cron@1.2.1
-pfafman:filesaver@0.2.0_1
-raix:eventemitter@0.1.2
-raix:handlebar-helpers@0.2.4
+npm-container@1.2.0
+npm-mongo@1.4.39_1
+oauth@1.1.6
+oauth2@1.1.5
+observe-sequence@1.0.7
+ordered-dict@1.0.4
+percolate:synced-cron@1.3.0
+pfafman:filesaver@0.2.1
+promise@0.5.0
+raix:eventemitter@0.1.3
+raix:handlebar-helpers@0.2.5
 raix:ui-dropped-event@0.0.7
-random@1.0.3
-reactive-dict@1.1.0
-reactive-var@1.0.5
-reload@1.1.3
-retry@1.0.3
-reywood:publish-composite@1.3.6
-routepolicy@1.0.5
-service-configuration@1.0.4
-session@1.1.0
-sha@1.0.3
+random@1.0.4
+rate-limit@1.0.0
+reactive-dict@1.1.2
+reactive-var@1.0.6
+reload@1.1.4
+retry@1.0.4
+reywood:publish-composite@1.4.2
+routepolicy@1.0.6
+service-configuration@1.0.5
+session@1.1.1
+sha@1.0.4
 softwarerero:accounts-t9n@1.0.9
-spacebars@1.0.6
-spacebars-compiler@1.0.6
-spiderable@1.0.7
-srp@1.0.3
-standard-app-packages@1.0.5
-tap:i18n@1.5.0
-templating@1.1.1
+spacebars@1.0.7
+spacebars-compiler@1.0.7
+spiderable@1.0.9
+srp@1.0.4
+standard-app-packages@1.0.6
+standard-minifiers@1.0.1
+tap:i18n@1.6.1
+templating@1.1.4
+templating-tools@1.0.0
 timmyg:wow@1.0.1
-tracker@1.0.7
+tracker@1.0.9
 tsega:skrollr@0.0.2
 twbs:bootstrap@3.3.5
-ui@1.0.6
-underscore@1.0.3
+ui@1.0.8
+underscore@1.0.4
 underscorestring:underscore.string@3.0.3_1
-url@1.0.4
-useraccounts:bootstrap@1.11.1
-useraccounts:core@1.11.1
-webapp@1.2.0
-webapp-hashing@1.0.3
-yogiben:autoform-file@0.2.7
+url@1.0.5
+useraccounts:bootstrap@1.12.3
+useraccounts:core@1.12.3
+useraccounts:iron-routing@1.12.3
+webapp@1.2.2
+webapp-hashing@1.0.5
 yogiben:autoform-map@0.1.3
-yogiben:autoform-modals@0.3.6
+yogiben:autoform-modals@0.3.8
 yogiben:helpers@0.0.6
 yogiben:mixpanel@0.0.7
 yogiben:pretty-email@0.0.6
-zimme:active-route@2.0.4_1
+zimme:active-route@2.3.2
 zimme:iron-router-active@1.0.4

client/style/global.less

@@ -1,6 +1,6 @@
 /* Bootstrap */
 @import "/client/style/bootstrap-variables.import.less";
-@import "/packages/bootstrap/bootstrap.import.less";
+/*@import "/packages/bootstrap/bootstrap.import.less";*/
 
 /* Views */
 @import "/client/views/home/home.less";

packages/npm-container/index.js

@@ -6,4 +6,4 @@ Meteor.npmRequire = function(moduleName) {
 Meteor.require = function(moduleName) {
   console.warn('Meteor.require is deprecated. Please use Meteor.npmRequire instead!');
   return Meteor.npmRequire(moduleName);
-};
+};

packages/npm-container/package.js

@@ -3,7 +3,7 @@ var fs = Npm.require('fs');
 
 Package.describe({
   summary: 'Contains all your npm dependencies',
-  version: '1.0.0',
+  version: '1.2.0',
   name: 'npm-container'
 });
 
@@ -19,5 +19,12 @@ try {
 // Adding the app's packages.json as a used file for this package will get
 // Meteor to watch it and reload this package when it changes
 Package.onUse(function(api) {
-  api.add_files(['index.js', '../../packages.json'], 'server');
-});
+  api.addFiles('index.js', 'server');
+  if (api.addAssets) {
+    api.addAssets('../../packages.json', 'server');
+  } else {
+    api.addFiles('../../packages.json', 'server', {
+      isAsset: true
+    });
+  }
+});