Merge branch 'release/v1.1.0'
Merge branch 'release/v1.2.0'
Quick permissions patch
Updated bg size
Bump version
Merge branch 'release/v1.2.1'
Merge branch 'release/v1.2.1' into develop
Merge branch 'master' of github.com:jplusplus/detective.io

Conflicts:
	app/detective/models.py
	bower.json
Merge branch 'master' into develop
Merge branch 'develop' of github.com:jplusplus/detective.io into develop