commiting for merging
merging
1
Merge branch 'master' of https://github.com/trungtruong/surveyapp

Conflicts:
	src/main/java/com/harveynash/surveyapp/controller/SurveyManagerController.java
	src/main/webapp/WEB-INF/views/addSurvey.jsp
	src/main/webapp/WEB-INF/views/surveyMngr.jsp