Move Bootstrap LESS loading back to main.less
Override glyphicon font path
Remove extraneous build code
Merge branch 'master' into relative-url-fixes

Conflicts:
	src/scripts/pages/app/app.less
	src/styles/main.less
Merge pull request #196 from Connexions/relative-url-fixes

Restore and Cleanup Bootstrap/LESS loading