Merge branch 'develop'
debug
Revert "debug"

This reverts commit 2b69132a1f0d10be63084e86026892be504be208.
Merge branch 'develop'
Merge branch 'master' of https://github.com/smilli/issheintome
Merge branch 'develop'
Merge branch 'develop'
Use real appID
Merge branch 'develop'
Revert "Merge branch 'develop'"

This reverts commit bbc7180348423732b1946f4fa273089495d96bdc, reversing
changes made to 6edb100cc748920215c84b1ea44a75da529d0e5f.
Merge branch 'develop'

Conflicts:
	static/js/main.js
Fix syntax error
get rid of conflicts ahhh!!
use real app ID
Merge branch 'master' into develop