Added settings activity
Merge branch 'development' of git@github.com:peterfomin/android.git into
development