Revert c2f5a48..98487e4

This rolls back to commit c2f5a48fe2485bf81fb621e9f5581db7d5dc8018.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	test/spec/controllers/about.js