changed from servlet to spring controller
Merge branch 'master' of github.com:osiam-dev/osiam