error

trying to sync
Merge branch 'master' of https://github.com/mpieler/WECE.Technovation

Conflicts:
	Breezer/res/layout/fragment_new_prescription.xml