Added style for demo app
Added styles to demo
Merge branch 'develop' into APPNG-89

Conflicts:
	demo/index-dist.html
	demo/index.html
Improved demo app