bla
update
Merge branch 'master' into lumin
setting
update
Merge branch 'lumin'

Conflicts:
	res/layout/activity_settings_screen.xml