Merge remote-tracking branch 'upstream/master'
Added require.js and made required changes in corresponding js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/webapp/WEB-INF/jsp/home.jsp
Merge pull request #28 from hemant24/master

Added require.js