New branch  develop
New branch  develop version 1.0
Merge develop

Conflicts:
	LICENSE.txt