Changed page size to 10 for commit test
Changed page size to 7 for commit test
Changed page size to 8 for commit test
Pagesize to 8
Token fchange-2
Pagesize to 8
Token change fchange-2
Pagesize to 5
removed token from fchange-2
pagesize is still 5
Page size to 7
Page size to 5
Page size to 7
Page size to 5
Page size to 8
Merge feature/FCHANGE-2 into develop

Conflicts:
	src/main/values/dev.properties
Merge origin/develop into develop