Update
Merge branch 'Prescription.Technology' of
https://github.com/bycolor/prescription.tehnology into
Prescription.Technology

Conflicts:
	res/layout/activity_main.xml