change Rakefile to support deploying to standalone tomcat; extended timeout
Merge branch 'OMRefactoring' of https://github.com/fangzhen/ode into OMRefactoring