Fixing a deprecated error
Adding highlightjs in bower
Merge remote-tracking branch 'upstream/ember1'

Conflicts:
	app/scripts/showcase/controllers/ApplicationController.coffee
Using multiline CS string
More cleanup using multi-line CS strings
Merge pull request #31 from huafu/master

Cleaning up a little bit and fixing the missing highlighttjs