Merge branch 'origin/master'
Submission and Bootstrap
`Merge branch 'origin/master'

Conflicts:
	WebContent/WEB-INF/Beans.xml
Merge branch 'origin/pmwiseman'
form working, need to get database entry working (DAOImp)
new submission files
Merge branch 'origin/pmwiseman'
submission.jsp
Merge branch 'origin/pmwiseman'
Merge branch 'origin/pmwiseman'
submission form working
empty
Merge branch 'origin/pmwiseman'