merge changes from test server

main.css merges not yet included
.css changes backported into sass files