Create project
Merge branch 'master' of https://github.com/idsoy/spring-shiro.git

Conflicts:
	.gitignore