fixed assets

Conflicts:
	app/assets/javascripts/mobile.js
	app/assets/stylesheets/mobile.css