Added content to settings page, UI improvements
Merge branch 'master' of https://github.com/programmingthomas/neon-2013