Merge origin/develop into develop

Conflicts:
	pom.xml
token fchange-3
removed token fchange-3
Merge feature/FCHANGE-3 into develop