Merge branch 'master' of git.53peaks.com:root/tripmixr

Conflicts:
	.gitignore
	android/out/production/android/android.apk
	android/out/production/android/android.unaligned.apk
	server/app.js
	server/public/js/map.js