TapApp

Change
Merge branch 'master' of https://github.com/tapapp/tapapp.github.io

Conflicts:
	Client-Side/TapDetector/.idea/workspace.xml
change

change
Merge branch 'master' of https://github.com/tapapp/tapapp.github.io