Added basic Shiro support
Removed @Override annotation
Added license header
Cleaned up
Merge branch 'feature/shiro' into develop