Local (user installed) libraries have priority over system libraries

See #1853
Removed unused code, fixed indentation.
Merge branch 'master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java