newAdd3
Merge remote-tracking branch 'origin/alex-dev' into alex-dev

Conflicts:
	app/src/main/res/layout/activity_my_activity2.xml
newAdd3