Merge remote-tracking branch 'origin/master'

Conflicts:
	IconArrStudie/src/main/res/layout/activity_test1.xml
i hate git