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

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