giga update
Merge branch 'master' of https://github.com/stijnstijn/plaything

Conflicts:
	lib/class.stdObject.php