update demo application
Merge branch 'master' of github.com:Umisoft/umi-demoapp
Merge branch 'master' of github.com:Umisoft/umi-demoapp

Conflicts:
	configuration/general.php