ios all views integrated
Merge branch 'master' of https://github.com/sirlordrouter/bfh.btx8108.groupbjjm.diabetes-pass

Conflicts:
	bti8108.groupbjjm.diabetespass/bti8108.groupbjjm.diabetespass.xcodeproj/project.pbxproj
deleted online version and used local copy