fixed integration (issue #76)
Merge branch 'origin/master'

Conflicts:
	Assets/Master-Common.unity