ASChangeLocationEvent Done
commit
commit
commit
commit
commit
commit
Merge branch 'master' of https://github.com/nbaudetheig/tedxEventManager

Conflicts:
	core/controller/Tedx_manager.class.php