Merge origin/master

Conflicts:
	src/main/resources/demoapp.properties
Page Size = 10