Added descriptions to boteditor methods.
Fixed a minor issue with boteditor
Merge branch 'master' of https://github.com/mbdietrich/MUCapstone2013_Team2
Changed servlet context path to relative again.