Merge branch 'username_field' of github.com:safexbristol/android_app into username_field
Fixed bug where view is null