Merge branch 'master' into master

app/.meteor/packages

@@ -4,8 +4,8 @@
 # but you can also edit it by hand.
 
 accounts-password@1.5.0
-accounts-ui@1.2.0
+accounts-ui@1.3.0
-random@1.0.10
+random@1.1.0
 dburles:collection-helpers
 reactive-var@1.0.11
 underscore@1.0.10
@@ -17,40 +17,40 @@ dburles:mongo-collection-instances
 percolate:migrations
 ecwyne:mathjs
 useraccounts:polymer
-accounts-google@1.3.0
+accounts-google@1.3.1
 splendido:accounts-meld
 email@1.2.3
 meteorhacks:subs-manager
 chuangbo:marked
 reywood:iron-router-ga
-meteor-base@1.2.0
+meteor-base@1.3.0
 mobile-experience@1.0.5
-mongo@1.3.1
+mongo@1.4.2
 blaze-html-templates
 session@1.1.7
 jquery@1.11.10
 tracker@1.1.3
 logging@1.1.19
-reload@1.1.11
+reload@1.2.0
 ejson@1.1.0
 spacebars
-check@1.2.5
+check@1.3.0
 useraccounts:iron-routing
 wizonesolutions:canonical
-standard-minifier-js@2.2.0
+standard-minifier-js@2.3.1
-shell-server@0.3.0
+shell-server@0.3.1
 seba:minifiers-autoprefixer
 nikogosovd:multiple-uihooks
 templates:array
-ecmascript@0.9.0
+ecmascript@0.10.6
-es5-shim@4.6.15
+es5-shim@4.7.0
 differential:vulcanize
 reactive-dict@1.2.0
 percolate:synced-cron
 ongoworks:speakingurl
 service-configuration@1.0.11
 google-config-ui@1.0.0
-dynamic-import@0.2.0
+dynamic-import@0.3.0
 ddp-rate-limiter@1.0.7
 rate-limit@1.0.8
 iron:router

app/.meteor/release

@@ -1 +1 @@
-METEOR@1.6.0.1
+METEOR@1.6.1.1

app/.meteor/versions

@@ -1,57 +1,57 @@
 accounts-base@1.4.2
 accounts-google@1.3.1
 accounts-oauth@1.1.15
-accounts-password@1.5.0
+accounts-password@1.5.1
-accounts-ui@1.2.0
+accounts-ui@1.3.0
-accounts-ui-unstyled@1.3.0
+accounts-ui-unstyled@1.4.1
 aldeed:collection2@2.10.0
 aldeed:collection2-core@1.2.0
 aldeed:schema-deny@1.1.0
 aldeed:schema-index@1.1.1
-aldeed:simple-schema@1.5.3
+aldeed:simple-schema@1.5.4
 allow-deny@1.1.0
-autoupdate@1.3.12
+autoupdate@1.4.0
-babel-compiler@6.24.7
+babel-compiler@7.0.9
-babel-runtime@1.1.1
+babel-runtime@1.2.2
-base64@1.0.10
+base64@1.0.11
 binary-heap@1.0.10
 blaze@2.3.2
 blaze-html-templates@1.1.2
 blaze-tools@1.0.10
-boilerplate-generator@1.3.1
+boilerplate-generator@1.4.0
-caching-compiler@1.1.11
+caching-compiler@1.1.12
 caching-html-compiler@1.1.2
-callback-hook@1.0.10
+callback-hook@1.1.0
-check@1.2.5
+check@1.3.1
 chuangbo:marked@0.3.5_1
-coffeescript@1.11.1_4
+coffeescript@1.0.17
 dburles:collection-helpers@1.1.0
 dburles:mongo-collection-instances@0.3.5
 ddp@1.4.0
-ddp-client@2.2.0
+ddp-client@2.3.2
-ddp-common@1.3.0
+ddp-common@1.4.0
 ddp-rate-limiter@1.0.7
-ddp-server@2.1.1
+ddp-server@2.1.2
 deps@1.0.12
-diff-sequence@1.0.7
+diff-sequence@1.1.0
 differential:vulcanize@3.0.0
-dynamic-import@0.2.1
+dynamic-import@0.3.0
-ecmascript@0.9.0
+ecmascript@0.10.9
 ecmascript-runtime@0.5.0
-ecmascript-runtime-client@0.5.0
+ecmascript-runtime-client@0.6.2
 ecmascript-runtime-server@0.5.0
 ecwyne:mathjs@0.25.0
 ejson@1.1.0
 email@1.2.3
-es5-shim@4.6.15
+es5-shim@4.7.3
 geojson-utils@1.0.10
 google-config-ui@1.0.0
 google-oauth@1.2.5
 hot-code-push@1.0.4
 html-tools@1.0.11
 htmljs@1.0.11
-http@1.3.0
+http@1.4.1
-id-map@1.0.9
+id-map@1.1.0
 iron:controller@1.0.12
 iron:core@1.0.11
 iron:dynamic-template@1.0.12
@@ -60,61 +60,64 @@ iron:location@1.0.11
 iron:middleware-stack@1.1.0
 iron:router@1.1.2
 iron:url@1.1.0
-jquery@1.11.10
+jquery@1.11.11
 lai:collection-extensions@0.2.1_1
 launch-screen@1.1.1
 less@2.7.12
 livedata@1.0.18
 localstorage@1.2.0
-logging@1.1.19
+logging@1.1.20
 matb33:collection-hooks@0.8.4
 mdg:validation-error@0.5.1
-meteor@1.8.2
+meteor@1.8.6
-meteor-base@1.2.0
+meteor-base@1.3.0
 meteorhacks:subs-manager@1.6.4
-minifier-css@1.2.16
+minifier-css@1.3.1
-minifier-js@2.2.2
+minifier-js@2.3.5
-minimongo@1.4.3
+minimongo@1.4.4
 mobile-experience@1.0.5
 mobile-status-bar@1.0.14
-modules@0.11.3
+modules@0.11.8
 modules-runtime@0.9.2
-momentjs:moment@2.20.1
+momentjs:moment@2.22.2
-mongo@1.3.1
+mongo@1.4.7
 mongo-dev-server@1.1.0
-mongo-id@1.0.6
+mongo-id@1.0.7
 nikogosovd:multiple-uihooks@0.1.8
 npm-bcrypt@0.9.3
 npm-mongo@2.2.34
-oauth@1.2.1
+oauth@1.2.3
 oauth2@1.2.0
 observe-sequence@1.0.16
 ongoworks:speakingurl@9.0.0
-ordered-dict@1.0.9
+ordered-dict@1.1.0
 percolate:migrations@0.9.8
 percolate:synced-cron@1.3.2
-promise@0.10.1
+promise@0.10.2
 raix:eventemitter@0.1.3
-random@1.0.10
+random@1.1.0
-rate-limit@1.0.8
+rate-limit@1.0.9
 reactive-dict@1.2.0
 reactive-var@1.0.11
-reload@1.1.11
+reload@1.2.0
-retry@1.0.9
+retry@1.1.0
 reywood:iron-router-ga@0.7.1
-routepolicy@1.0.12
+routepolicy@1.0.13
 seba:minifiers-autoprefixer@1.0.1
+server-render@0.3.1
 service-configuration@1.0.11
 session@1.1.7
 sha@1.0.9
 shell-server@0.3.1
+shim-common@0.1.0
+socket-stream-client@0.1.0
 softwarerero:accounts-t9n@1.3.11
 spacebars@1.0.15
 spacebars-compiler@1.1.3
 splendido:accounts-emails-field@1.2.0
 splendido:accounts-meld@1.3.1
 srp@1.0.10
-standard-minifier-js@2.2.3
+standard-minifier-js@2.3.4
 templates:array@1.0.3
 templating@1.3.2
 templating-compiler@1.3.3
@@ -123,11 +126,11 @@ templating-tools@1.1.2
 tracker@1.1.3
 ui@1.0.13
 underscore@1.0.10
-url@1.1.0
+url@1.2.0
 useraccounts:core@1.14.2
 useraccounts:iron-routing@1.14.2
 useraccounts:polymer@1.14.2
-webapp@1.4.0
+webapp@1.5.0
 webapp-hashing@1.0.9
 wizonesolutions:canonical@0.0.5
 zimme:collection-behaviours@1.1.3

app/Routes/API.js

@@ -23,6 +23,7 @@ Router.map(function() {
 			);
 		},
 	});
+
 	this.route("jsonCharacterSheet", {
 		path: "/character/:_id/json",
 		where: "server",

app/client/views/characterList/characterList.css

@@ -10,6 +10,7 @@
 
 .partyHeader {
 	display: inline-block;
+	min-width: 80px;
 }
 
 .partyHeader iron-icon {

app/package.json

@@ -11,12 +11,13 @@
   },
   "author": "Stefan Zermatten",
   "dependencies": {
+    "@babel/runtime": "^7.0.0-beta.49",
     "@polymer/polymer": "^1.2.5-npm-test.2",
     "babel-runtime": "^6.26.0",
     "bcrypt": "^1.0.3",
     "bower": "^1.7.9",
-    "core-js": "^2.5.1",
+    "core-js": "^2.5.7",
-    "meteor-node-stubs": "^0.3.2",
+    "meteor-node-stubs": "^0.3.3",
     "qrcode": "^1.2.0"
   }
 }