setting up for packing
Merge branch 'master' of https://github.com/PetarT/RedcomponentDemo

Conflicts:
	administrator/components/index.html
	administrator/components/models/forms/index.html
	administrator/components/models/index.html
	administrator/components/views/demouser/index.html
	administrator/components/views/demousers/index.html
	administrator/components/views/index.html
	index.html
	models/forms/index.html
	models/index.html
	views/demouser/index.html