Work on app frontend
Merge branch 'development' of https://github.com/arsood/Branch into development