merge
Merge remote-tracking branch 'origin/master'

Conflicts:
	uberPaste/src/main/webapp/libs/syntax-highlight/styles/shCoreDefault.css
lost libs