Added settings activity.
Merge branch 'dev' of github.com:Clegs/MeadLog into dev