Better integration with Spring Security

* CustomUserDetailsService must stay separate from UserService
* As the current configuration stands, SpringSecurity makes an incompatible proxy with regular Autowiring. There may be a way to fix this, but for now this works.
* Removed reliance on ROLE_USER, only checks isAuthenticated() and ROLE_ADMIN

Need to add a user control page