Merge branch 'master' of github.com:koding/kd into master.splitview

Conflicts:
	src/components/split/splitview.coffee
Merge branch 'master.splitview' of github.com:koding/kd into master.splitview