Combine js
Merge branch 'master' of github.com:gogits/scaffold

Conflicts:
	js/external.js
	js/min/external-min.js
Merge branch 'master' of github.com:gogits/scaffold