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

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