Merge origin/master

Conflicts:
	src/main/resources/demoapp.properties
Page Size = 10
Merge develop into feature/FCHANGE-2
Merge origin/develop into develop

Conflicts:
	pom.xml
Merge origin/develop into develop

Conflicts:
	pom.xml
 pagesize to 5
Changed page size to 3 fro commit test
Merge pull request #1 from psutech00/feature/FCHANGE-2

Feature/fchange 2