A working sandbox
A working sandbox
A working sandbox
Merge branch 'master' into d

Conflicts:
	.idea/jsLibraryMappings.xml
	package.json