uncompressed css
fixes
fix conflict
Merge pull request #277 from ocupop/dart-1.0

New PR with merges