Merge branch 'master' of https://github.com/stardz/DoctorMBG

Conflicts:
	app/src/main/res/layout/element_disscusion.xml