Commit changes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/awesomeapp/com/medcenter/MainActivity.java