Merge branch 'local' into develop
updated breakout session
start to use devlop branch
minor form changes
Merge branch 'develop' into heqiao
changed X button
fix add speaker layout; adjust directory structure
Merge branch 'heqiao' of github.com:heqiao/TFSC into heqiao

Conflicts:
	create_event.php
	css/tfsc.css
fix add breakout session problem; add group_name to session
Merge branch 'heqiao' into develop
Merge branch 'develop' into local