Maj
Maj
maj
Merge branch 'master' of https://github.com/jlgigante/troisw

Conflicts:
	site/skins/css/style.css
	site/skins/js/custom.js
	site/templates/structure.tpl