added a settings activity with a template option
Merge remote-tracking branch 'origin/master'