Commit for pull
Commit for pull
Merge branch 'origin/master'

Conflicts:
	workspace/enwida-web/src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
	workspace/enwida-web/src/main/webapp/WEB-INF/views/home.jsp
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	workspace/enwida-web/.project
	workspace/enwida-web/src/main/webapp/WEB-INF/views/home.jsp
Missing Type Cast