import autoconfig
Merge branch 'master' of github.com:ZCLanner/placeholder

Conflicts:
	pom.xml
	src/main/webapp/META-INF/autoconf/auto-config.xml