Merge origin/develop into develop

Conflicts:
	pom.xml
Merge origin/develop into develop

Conflicts:
	pom.xml
Changed pagesize for FCHANGE-1 branch test
Restored pagesize to 10
pagesize to 331
Merge pull request #2 from psutech00/feature/FCHANGE-1

Feature/fchange 1