HTML5
HTML5
Merge remote-tracking branch 'origin/deus'

Conflicts:
	.idea/jsLibraryMappings.xml
	js/magic.js
HTML5