constraints jan
Merge branch 'master' of https://github.com/sirlordrouter/bfh.btx8108.groupbjjm.diabetes-pass

Conflicts:
	bti8108.groupbjjm.diabetespass/bti8108.groupbjjm.diabetespass/Base.lproj/Main_iPhone.storyboard