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

Conflicts:
	core/init.php
dingen 3