changed layout for settings
Added help and about settings
started working on unlink account in settings
fixed merge errors
Merge branch 'master' of https://github.com/nplaster/App2PhotoViewer