xml error
Everything ready now!
Merge branch 'master' of https://github.com/PetarT/RedcomponentDemo

Conflicts:
	administrator/components/com_demo/demo.xml
	demo.xml