bump
bump
Merge branch 'ui' into development

Conflicts:
	atom.xml
Merge pull request #435 from luixxiul/development

Development