New Init.
Merge branch 'master' of
https://github.com/markuslamm/urbanstreetart-web

Conflicts:
	.gitignore
	README.md
	pom.xml
	src/main/java/de/bht/urbanstreetart/config/ApplicationConfig.java
	src/main/java/de/bht/urbanstreetart/config/EmailSenderConfig.java
	src/main/java/de/bht/urbanstreetart/config/Neo4JConfig.java
	src/main/java/de/bht/urbanstreetart/config/SecurityConfig.java
	src/main/java/de/bht/urbanstreetart/config/TestDataConfiguration.java
	src/main/java/de/bht/urbanstreetart/config/WebConfig.java
	src/main/java/de/bht/urbanstreetart/controller/web/AccessController.java
	src/main/java/de/bht/urbanstreetart/controller/web/FriendshipController.java
	src/main/java/de/bht/urbanstreetart/controller/web/IndexController.java
	src/main/java/de/bht/urbanstreetart/controller/web/ProfileController.java
	src/main/java/de/bht/urbanstreetart/controller/web/SignUpController.java
	src/main/java/de/bht/urbanstreetart/controller/web/SignUpForm.java
	src/main/java/de/bht/urbanstreetart/controller/web/WrongConfirmationHashException.java
	src/main/java/de/bht/urbanstreetart/domain/auth/Account.java
	src/main/java/de/bht/urbanstreetart/domain/auth/Role.java
	src/main/java/de/bht/urbanstreetart/domain/auth/SignUpRequest.java
	src/main/java/de/bht/urbanstreetart/domain/base/BaseEntity.java
	src/main/java/de/bht/urbanstreetart/domain/base/Identifiable.java
	src/main/java/de/bht/urbanstreetart/domain/invite/Invitation.java
	src/main/java/de/bht/urbanstreetart/domain/profile/FriendshipRequest.java
	src/main/java/de/bht/urbanstreetart/domain/profile/Profile.java
	src/main/java/de/bht/urbanstreetart/domain/shot/GeoLocation.java
	src/main/java/de/bht/urbanstreetart/domain/shot/Tag.java
	src/main/java/de/bht/urbanstreetart/domain/shot/UserShot.java
	src/main/java/de/bht/urbanstreetart/event/events/BaseEvent.java
	src/main/java/de/bht/urbanstreetart/event/events/FriendshipRequestEvent.java
	src/main/java/de/bht/urbanstreetart/event/events/NewInvitationEvent.java
	src/main/java/de/bht/urbanstreetart/event/events/SignUpConfirmedEvent.java
	src/main/java/de/bht/urbanstreetart/event/events/SignUpRequestEvent.java
	src/main/java/de/bht/urbanstreetart/event/listener/BaseEventListener.java
	src/main/java/de/bht/urbanstreetart/event/listener/FriendshipRequestListener.java
	src/main/java/de/bht/urbanstreetart/event/listener/NewInvitationEventListener.java
	src/main/java/de/bht/urbanstreetart/event/listener/SignUpConfirmedListener.java
	src/main/java/de/bht/urbanstreetart/event/listener/SignUpRequestEventListener.java
	src/main/java/de/bht/urbanstreetart/event/publisher/BaseEventPublisher.java
	src/main/java/de/bht/urbanstreetart/event/publisher/FriendshipRequestEventPublisher.java
	src/main/java/de/bht/urbanstreetart/event/publisher/NewInvitationEventPublisher.java
	src/main/java/de/bht/urbanstreetart/event/publisher/SignUpConfirmedPublisher.java
	src/main/java/de/bht/urbanstreetart/event/publisher/SignUpRequestEventPublisher.java
	src/main/java/de/bht/urbanstreetart/repository/AccountRepository.java
	src/main/java/de/bht/urbanstreetart/repository/FriendshipRequestRepository.java
	src/main/java/de/bht/urbanstreetart/repository/InvitationRepository.java
	src/main/java/de/bht/urbanstreetart/repository/ProfileRepository.java
	src/main/java/de/bht/urbanstreetart/repository/RoleRepository.java
	src/main/java/de/bht/urbanstreetart/repository/SignUpRequestRepository.java
	src/main/java/de/bht/urbanstreetart/security/AccountUtils.java
	src/main/java/de/bht/urbanstreetart/security/CustomUserDetails.java
	src/main/java/de/bht/urbanstreetart/security/CustomUserDetailsService.java
	src/main/java/de/bht/urbanstreetart/service/TestGraphPopulator.java
	src/main/java/de/bht/urbanstreetart/service/api/AccountService.java
	src/main/java/de/bht/urbanstreetart/service/api/BaseEntityService.java
	src/main/java/de/bht/urbanstreetart/service/api/EmailService.java
	src/main/java/de/bht/urbanstreetart/service/api/FriendshipRequestService.java
	src/main/java/de/bht/urbanstreetart/service/api/InvitationService.java
	src/main/java/de/bht/urbanstreetart/service/api/ProfileService.java
	src/main/java/de/bht/urbanstreetart/service/api/RoleService.java
	src/main/java/de/bht/urbanstreetart/service/api/SignUpService.java
	src/main/java/de/bht/urbanstreetart/service/impl/AccountServiceImpl.java
	src/main/java/de/bht/urbanstreetart/service/impl/BaseEntityServiceImpl.java
	src/main/java/de/bht/urbanstreetart/service/impl/FriendshipRequestServiceImpl.java
	src/main/java/de/bht/urbanstreetart/service/impl/InvitationServiceImpl.java
	src/main/java/de/bht/urbanstreetart/service/impl/ProfileServiceImpl.java
	src/main/java/de/bht/urbanstreetart/service/impl/RoleServiceImpl.java
	src/main/java/de/bht/urbanstreetart/service/impl/SignUpServiceImpl.java
	src/main/java/de/bht/urbanstreetart/service/impl/VelocityEmailService.java
	src/main/resources/logback.xml
	src/main/resources/mail.properties
	src/main/resources/spring/neo4j-context.xml
	src/main/resources/spring/security-context.xml
	src/main/resources/velocity/friendrequest-confirmed.vm
	src/main/resources/velocity/friendrequest.vm
	src/main/resources/velocity/invitation.vm
	src/main/resources/velocity/signup-confirm.vm
	src/main/resources/velocity/welcome.vm
	src/main/webapp/WEB-INF/templates/admin/index.html
	src/main/webapp/WEB-INF/templates/auth/confirm.html
	src/main/webapp/WEB-INF/templates/auth/login.html
	src/main/webapp/WEB-INF/templates/auth/signup.html
	src/main/webapp/WEB-INF/templates/auth/welcome.html
	src/main/webapp/WEB-INF/templates/index.html
	src/main/webapp/WEB-INF/templates/mainLayout.html
	src/main/webapp/WEB-INF/templates/profile/friendlist.html
	src/main/webapp/WEB-INF/templates/profile/friendrequests.html
	src/main/webapp/WEB-INF/templates/profile/index.html
	src/main/webapp/WEB-INF/templates/test.html
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/resources/css/main.css
	src/main/webapp/resources/css/normalize.css
	src/main/webapp/resources/js/main.js
	src/main/webapp/resources/js/plugins.js
	src/main/webapp/resources/js/vendor/gmap.js
	src/main/webapp/resources/js/vendor/jquery-1.8.2.min.js
	src/main/webapp/resources/js/vendor/modernizr-2.6.2.min.js
	src/test/java/de/bht/streetartatlas/domain/AccountTest.java
	src/test/java/de/bht/streetartatlas/domain/InvitationTest.java
	src/test/java/de/bht/streetartatlas/domain/ProfileTest.java
	src/test/java/de/bht/streetartatlas/domain/RoleTest.java
	src/test/java/de/bht/streetartatlas/domain/SignUpRequestTest.java
	src/test/java/de/bht/streetartatlas/event/FriendshipRequestEventTest.java
	src/test/java/de/bht/streetartatlas/event/NewInvitationEventTest.java
	src/test/java/de/bht/streetartatlas/event/SignUpConfirmedTest.java
	src/test/java/de/bht/streetartatlas/event/SignUpRequestEventTest.java
	src/test/java/de/bht/streetartatlas/integration/AccountServiceTest.java
	src/test/java/de/bht/streetartatlas/integration/EmailServiceTest.java
	src/test/java/de/bht/streetartatlas/integration/InvitationServiceTest.java
	src/test/java/de/bht/streetartatlas/integration/ProfileServiceTest.java
	src/test/java/de/bht/streetartatlas/integration/RoleServiceTest.java
	src/test/java/de/bht/streetartatlas/integration/SignUpServiceTest.java