fix error
Merge branch 'master' of https://github.com/JavaKHTN/DACK

Conflicts:
	DACK/.settings/org.eclipse.core.resources.prefs
	DACK/src/main/webapp/WEB-INF/pages/header.jsp
	DACK/src/main/webapp/WEB-INF/pages/login.jsp
	DACK/src/main/webapp/index.jsp
	DACK/target/m2e-wtp/web-resources/META-INF/maven/com.StoreOnline/DACK/pom.properties