Sprint -> Release
Merge remote-tracking branch 'upstream/master' into sprint-to-release

Conflicts:
	appshell/version.rc
	installer/mac/buildInstaller.sh
	installer/win/brackets-win-install-build.xml
Merge pull request #462 from MarcelGerber/sprint-to-release

Sprint -> Release