Removing unneeded classes. Adding Javascript
-Ashish Swami
Merge origin/master

Conflicts resolved:
	src/java/hibernate.cfg.xml