Merge branch 'development' of github.com:dramentol/test into development

Conflicts:
	README.md
jjjj
jjjj
daf