fixed some issues, restructuring sass
lots of refactoring various bugfixes
removed sass caches from dev
Merge branch 'dev'