Merge branch 'develop' into import-framework

.docker/dockerfiles/develop/Dockerfile

.docker/dockerfiles/slim/Dockerfile

.jshintrc

.meteor/packages

.meteor/versions

.sandstorm/build.sh

.sandstorm/global-setup.sh

.sandstorm/launcher.sh

.sandstorm/sandstorm-pkgdef.capnp

.sandstorm/setup.sh

.travis.yml

.travis/docker.sh

.travis/namefiles.sh

.travis/sandstorm.sh

.travis/setupsig.sh

.travis/update-releases.sh

HISTORY.md

client/startup/startup.coffee

i18n/ar.i18n.json

i18n/de.i18n.json