added extension highlight on list of history diff
Fixed position problem with the file edited mark
Merge branch 'master' of http://github.com/FezVrasta/brackets-git into FezVrasta-master

Conflicts:
	less/brackets-git.less
	src/Panel.js