fix bug
Merge branch 'master' of https://github.com/antme/jgs_cms

Conflicts:
	drupal/sites/all/themes/holiday/templates/page--front.tpl.php