no message
Merge branch 'FML_its_working' of https://github.com/wilson100hong/MeetBoy into FML_its_working

Conflicts:
	public/javascripts/meeting.js
no message