Conflicts:
	src/main/webapp/WEB-INF/views/index.jsp
'Merging'