Updated beans and Spring Security
Updated beans and Spring Security
Merge branch 'master' of https://bitbucket.org/denismurphy/workie

Conflicts:
	webapplication/src/main/java/co/workie/model/Employee.java
	webapplication/src/main/java/co/workie/service/user/UserDetailsServiceImpl.java