adding two themes
remove file
add two more themes
adding more themes
Merge branch 'build_pages' into develop
Merge branch 'release-1.1'
use rails stylesheet tag
Merge branch 'build_pages' into develop
Merge branch 'release-1.2'
lets try that again shall we?
Merge branch 'build_pages' into develop
Merge branch 'release-1.3'
need to test this
Merge branch 'build_pages' into develop
Merge branch 'release-1.4'
adding it back
Merge branch 'build_pages' into develop
Merge branch 'release-1.5'
precompiled assets
Merge branch 'build_pages' into develop