c1
c4
c6
asdf
Merge branch 'dev2' into dev

Conflicts:
	doc1
Merge branch 'dev3' into dev

Conflicts:
	doc1
release 1.0