Revert d1c0aa9..54e0727

This rolls back to commit d1c0aa9762b308ebde4e01c02f3396b770b8ba86.
Merge branch 'master' of https://github.com/thejerrybao/Nimbus

Conflicts:
	admin/committees.php
	admin/css/chosen.css
	admin/dbfunc.php
	admin/events.php
	admin/js/bootstrap.js
	admin/js/chosen.jquery.min.js
	admin/js/events.js