Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools

Conflicts:
	client/Main/navigation/navigationlink.coffee
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools

Conflicts:
	client/CollaborativeWorkspace/collaborativeworkspace.coffee
	client/Framework
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools

Conflicts:
	client/Main/includes.coffee
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools

Conflicts:
	client/Framework
	client/Main/includes.coffee
	client/Main/notificationcontroller.coffee
	go/src/koding/kites/os/files/templates/app/blank/resources/style.css
	go/templates/app/blank/index.coffee
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools

Conflicts:
	client/Finder/filetree/controllers/findercontroller.coffee
	client/Finder/fs/fsfolder.coffee
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools

Conflicts:
	client/Main/kodingappscontroller.coffee
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools
Merge branch 'master' of git.sj.koding.com:koding/koding into master.stack
Merge branch 'master' of git.sj.koding.com:koding/koding into resurrection.devtools
Restyled permissions view in finder.
Merge branch 'master' of git.sj.koding.com:koding/koding into master.stack
 Merge branch 'master.finderPermissons.styl' into 'master'

Master.Finder Permissons.Styl

http://prntscr.com/32mtv8
Merge branch 'master' of git.sj.koding.com:koding/koding into master.stack

Conflicts:
	client/Framework
Merge branch 'master' of git.sj.koding.com:koding/koding into master.stack
Finder:style: show the chevron for selected items which causes wrong positioning with contextmenu
Merge branch 'master' of git.sj.koding.com:koding/koding into master.stack-init-scripts
Merge branch 'master' of git.sj.koding.com:koding/koding into master.stack