Clean-up
Merge branch '3.0.0-PES' of https://github.com/pivotal-energy-solutions/bootstrap into 3.0.0-PES

Conflicts:
	less/datepicker.less
	less/fileupload.less
Clean-up I think basebootstrap is fixed.