Merge branch 'master' into dev

Conflicts:
	app/controllers/contests.js
Merge branch 'dev' of https://github.com/aremnev/imagerate into dev