Ribbon fiix 1.2
Merge branch 'master' of https://github.com/carlosepp/XDNA

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