restructure codebase to move away from jsp model and into the restful model
Merge remote-tracking branch 'origin/master'