Edit za text greške
Merge branch 'master' of https://github.com/0ximDigital/SEETech

Conflicts:
	app/src/main/java/hzzo/cvim/hr/pametnozdravlje/Activities/AddAppointmentActivity.java