added settings
Merge branch 'develop' of https://github.com/kenowessels/Runtime into develop

Conflicts:
	res/layout/activity_main.xml