settings activity
Merge branch 'master' of https://github.com/malyanov/sms_firewall

Conflicts:
	res/layout/activity_main.xml