updated docs for settingsactivity and cleaned up the code
Merge branch 'master' of https://github.com/gnu-user/free-room-website