Update file.js
Merge branch 'master' into develop

Conflicts:
	file.js
Merge branch 'develop'