Did some refactoring
Did some refactoring
Did some refactoring
Merge branch 'master' into resourses

Conflicts:
	main.js
Merge branch 'master' into resourses

Conflicts:
	main.js
Merge branch 'resourses'