reset
working modals
commit before pull
click and touch working
Merge branch 'uiwork'

Conflicts:
	app/assets/stylesheets/mobile.css.scss
complete touch and click