It works!
Merge remote-tracking branch 'origin/master'

Conflicts:
	moodacatcher/static/src/index.html
Merge remote-tracking branch 'origin/master'

Conflicts:
Merge remote-tracking branch 'origin/master'
Fix index.html scripts.