Merge branch 'master' of https://github.com/NovaTango/Tango

Conflicts:
	profile.php