Created a base webapp
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/content/pages/uploadBean.jsp
	WebContent/js/beanUtil.js