Removed many unnecessary `controller.` uses in templates.
`target="controller"` is unnecessary. By default it will target the controller.
Removed many unnecessary paths that included `content.x` when just `x` would do.
Changed `elementId` to be `id`
icon tweak on merge/split
Merge branch 'master' of git://github.com/discourse/discourse