fix
Merge branch 'development' into ui

Conflicts:
	index.html
Merge pull request #97 from luixxiul/ui

fix