createid
11
Merge branch 'master' of https://github.com/bushinvren/idserver

Conflicts:
	src/main/webapp/WEB-INF/views/App3.jsp

target/m2e-wtp/web-resources/META-INF/maven/com.hojy/idserver/pom.proper
ties