Revert "Revert commit beb4085"

This reverts commit 8c8c6d7c0181a07b2f64bbe0caae1a4daadf328a.

Conflicts:
	src/js/app.js