merging
Merge branch 'master' of https://github.com/trungtruong/surveyapp.git

Conflicts:
	src/main/java/com/harveynash/surveyapp/controller/HomeController.java
	src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
	src/main/webapp/WEB-INF/views/home.jsp