e branch 'develop' of https://github.com/eadpucv/pyxis into develop

Conflicts:
	css/pyxis.css
Revert dbc00ac..b13eb8b

This rolls back to commit dbc00aca0bb3c26f3d4fba183ad2e6a8a53f35ad.