Merge branch 'release/1.2.0' into develop
Updated the login server to 1.2.1

Change-Id: Ia42b5a68cb420baa03aa8410719e78e12ca4f74f
Fixed the appearance of the delete button on the approvals page

Change-Id: I1cfdb41bfe772bbd4f78072eabf7b873778def7d
Merge branch 'develop'

Change-Id: Ic3448dfe0f208a633d9d49da79547fa7edcc06c7