Refactored code and fixed loading system
Merge branch 'gh-pages'

Conflicts:
	scripts/character.js