Init
Merge origin/master

Conflicts:
	Zing/Zing.php