updated java version
added mvc framework
Merge branch 'master' of https://github.com/testathon/triptofan.git
added updated