init
init
Merge branch 'develop'

Conflicts:
	.idea/vcs.xml
	.idea/workspace.xml
Merge branch 'release/v1.0.0'
Merge tag 'tagsv1.0.0' into develop

Tagging version v1.0.0 tagsv1.0.0