litter things
no change
user settings jsp
no changes
Merge branch 'master' of https://github.com/hansell/Kitchensurfing.git