Merge from master
Merge branch 'master' of https://github.com/Freshmen/freshman-orienteering

Conflicts:
	public/javascripts/m_event_controler.js
	public/stylesheets/mobile.css
	public/stylesheets/mobile.styl