namespaces on routes
rails-sass is working bootstrap makes everything look like hell
Adding dependency directives to stylesheet to avoid DependecyError

The following pull request from the sprockets-rails gem
(https://github.com/rails/sprockets-rails/pull/96) requires that the
referenced assets be declared explicitly with the dependency directives
(i.e. the `depend_on` or `depend_on_asset` directive).

Adding the dependency directives to the affected stylesheets.
bootstrap 3 everywhere
fixing reorder tests
adjusting generator
adding missing form-control class to default_field
Updating icons to match bootstrap icon markup
Merge pull request #447 from richsinn/master

Adding dependency directives to stylesheet to avoid DependecyError
Merge branch 'master' into 1.12

Conflicts:
	app/assets/javascripts/comfortable_mexican_sofa/application.js.coffee
	app/assets/stylesheets/comfortable_mexican_sofa/bootstrap_overrides.css.sass
if site_id is passed in we don't really need to deal with cms_path
Merge branch '1.12' of github.com:comfy/comfortable-mexican-sofa into 1.12
test gemfiles
proper sass-rails version
bumping ruby
making sure migration runs
error is danger now. thanks bootstrap
Bump to 1.12.0
oh css