More app interactions \o/
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/frontend/index.html
	www/frontend/js/appInteraction.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/frontend/index.html
	www/frontend/js/appInteraction.js