David
Merge branch 'master' of https://github.com/raymondchandra/hfi

Conflicts:
	app/views/pages/simposium/admin/simposium_template_editor.blade.php