Merge branch 'master' of https://github.com/Rabmuk/Teem

Conflicts:
	public/about.php
	public/contact.php
Merge branch 'master' of https://github.com/Rabmuk/Teem

Conflicts:
	public/agenda.php
	public/contact.php
	public/css/editgroup.css
	public/editgroup.php
	public/headerNav.php