Merge branch 'development' of http://stash.vsoftconsulting.com:7990/scm/uoflma/uofl-android into development
