Merge branch 'release/0.3.18' into develop
update and builder
update getRelatedFiles
update grunt watch
Merge branch 'develop' of https://github.com/G-js/G-builder into develop

Conflicts:
	grunt/tasks/watch.js