dev2 merge
Merge branch 'dev2_feat' into dev2
ff

Conflicts:
	README.md
updated