Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/activity_main.xml
afdasgsa
Merge remote-tracking branch 'origin/master'