Apparently i changed things...
Merge branch 'master' of https://github.com/Rabmuk/Teem

Conflicts:
	public/accountsettings.php
	public/css/foundation.css