dev1 added
Merge branch 'dev' into dev1

Conflicts:
	readme.md