message
Merge branch 'master' of https://github.com/xiezuming/nirvanaWeb.git

Conflicts:
	application/views/event/contact.php
	application/views/event/contact_success.php