1
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/__init__.py
Merge branch 'master' of https://github.com/sooop/w