updated colorbox and jquerymobile

Conflicts:
	vendor/assets/javascripts/jquery.colorbox.js