Update README.md
further updates
make he branch
make the branch
further updates
Merge branch 'dev'

Conflicts:
	app/assets/javascripts/ui/ui.js
more updates
kinky bg