Merge branch 'release/version_1'
Merge branch 'release/version_2'
Merge branch 'release/crashlytics'
releasing newrelic
Merge branch 'release/newrelic'
bump up version
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
Merge branch 'release/trains'
bumped up version
disable zoom controls