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

Conflicts:
	drupal/sites/all/themes/Mode_two/templates/page.tpl.php