oscar
new
Merge branch 'master' of https://github.com/carlosepp/XDNA

Conflicts:
stylesheets/xd.css
stylesheets/xdadmin.css
Merge branch 'master' of https://github.com/carlosepp/XDNA

Conflicts:
	stylesheets/xd.css
	stylesheets/xdadmin.css