Merge branch 'backEnd_Event'
Merge branch 'master' of https://github.com/chrisfan918/Tap-in_backEnd