Removed conflicts from reviewcenter and the new login.
Merge branch 'dev' of https://github.com/waaghals/Tainted-Aberrant-Lion into dev