Re: #1677 - added basis of token service
Merge branch 'neo4j' into masterNeoMerge

Conflicts:
	portal2/pom.xml
	portal2/src/main/java/eu/europeana/portal2/services/BingTokenService.java
Portal2 now compiles
Merge branch 'neo4j' into masterNeoMerge