Merge branch 'develop' of git://github.com/runrev/livecode into develop

Conflicts:
	version