Change version in setup and documentation
Merge branch 'develop' into release/v1.1
Merge branch 'develop' into release/v1.1
Change version to 1.1a1
Merge branch 'develop' into release/v1.1
Merge branch 'develop' into release/v1.1
Merge branch 'develop' into release/v1.1
Merge branch 'develop' into release/v1.1
Merge branch 'develop' into release/v1.1

Conflicts:
	apidoc/__init__.py
Merge branch 'develop' into release/v1.1
Changin version and Status
Merge branch 'release/v1.1' into develop