Back to normal functionality
Added comment header
Merge JS and CSS into single assets
Temp conatenation of tl and cc css for bug fix
Merge branch 'development' into heroku

Conflicts:
	config/environments.rb
	views/classy_cate.user.js.erb
Changed heroku location