update
Merge branch 'master' of https://github.com/aztack/aztec-alpha

Conflicts:
	src/lang/object.js