Merge branch 'release/1.0' into development

Production required changes addded
Updated readme
Merge branch 'development'

Update readme

Conflicts:
	README.md
Merge branch 'master' into heroku-master

Update readme