checkin
merging
Merge branch 'develop' of github.com:studgent/android into develop
checkin
Merge branch 'develop' of github.com:studgent/android into develop