trying to edit mobile version
Merge branch 'dev' of https://github.com/rice-apps/servery-app into dev

Conflicts:
	app/static/views/main.html