15th commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	iMediCare/res/values/about.xml
	iMediCare/src/kucse/project/imedicare/About.java
	iMediCare/src/kucse/project/imedicare/MainMenu.java