Merge branch 'feature/issue-5-travis' into develop
start of clinic admin