Fix #BB-870
Add ember rc6 adn some style
Fix login tests
Two more fixes for functional tests
Force manage templates to english
Fix functional tests
Merge pull request #525 from gannetson/fixes-fixes-fixes

Fixes fixes fixes