test6
Merge branch 'master' into production

* master:
  test6

Conflicts:
	footer.php