admin theme begin
Merge branch 'master' of github.com:jasonayre/trax

Conflicts:
	admin/app/assets/javascripts/templates/admin/channels/index.html
	core/spec/traxblog/log/development.log