Merge branch 'release/1.1.1' into develop
Initial UI overhaul. Changed the way meds look. Still needs help in action bar and all backend stuff
Finished with all of the UI overhaul, now comes backend
Merge branch 'feature/med_page_UI_overhaul' into develop
Initial changes to how we report meds to the backend are finished. Need to test and maybe move a few things.
Fixed some bugs
hotfixes for the master
bump version for hotfix
Merge branch 'hotfix/backend_hotfix' into develop
Merge branch 'hotfix/backend_hotfix'
bring us up to speed after the hotfix
yet more bug fixes due to my silliness
Merge branch 'feature/medication_backend_overhaul' into develop

Conflicts:
	Healthie/src/main/java/me/ms101/healthie/Backend.java
Fixed the dumb conflict hopefully?
bump to version 1.1.2 (this won't be released to users)
Merge branch 'release/1.1.2'