organising imports
Merge branch 'master' of https://github.com/pedroneil/lbm-webapp

Conflicts:
	src/main/resources/com/logbookmanager/configuration/spring/app-security.xml
	src/test/java/com/logbookmanager/flows/LogbookFlowTests.java
	src/test/java/com/logbookmanager/mvc/SignupControllerIntegrationTests.java