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

Conflicts:
	public/javascripts/m_event_controler.js
refine event UI and related javascript code