merge with master
Merge branch 'master' of https://github.com/jed15/socialwiki
Added theme switching capabilities
Merge branch 'master' of https://github.com/jed15/socialwiki