Merge branch 'develop'

Conflicts:
	README.md
Merge branch 'master' of github.com:amam57/development
Merge branch 'develop'
Merge branch 'develop'