header fixes
fix merge
Merge branch 'master' of https://github.com/diegopuglia/cdm

Conflicts:
	admin/application/views/scripts/tour/add-tour.phtml
	admin/application/views/scripts/tour/edit-tour.phtml