added shiro
Merge branch 'master' of https://github.com/lbeuster/sandbox.git

Conflicts:
	sandbox-orika/pom.xml