s
Merge branch 'development' of
https://github.com/Septima/spatialsuite-s4.git into development

Conflicts:
	css/s4.css
Opdateret til SS 2.2