Fixes
Merge remote-tracking branch 'origin/politics' into politics

Conflicts:
	src/Application.js