make git-prompt optional
svn aliases
find the right cscope
Git SVN convert
Better Java Syntax colors

Conflicts:
	Projects/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
Solarized Dark theme