html pages from Dragos
Merge branch 'master' of github.com:adrianamb91/panda

Conflicts:
	html/homepageAdmin.html
	html/tabcontent/demo.html
	html/tabcontent/tabcontent.js
	html/tabcontent/template1/tabcontent.css
	html/tabcontent/template2/tabcontent.css
	html/tabcontent/template3/tabcontent.css
	html/tabcontent/template4/tabcontent.css
	html/tabcontent/template5/tabcontent.css
	html/tabcontent/template6/tabcontent.css