update requirements
Merge branch 'release/2.0.0'
Merge branch 'release/2.0.0a'

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'release/2.0.1'
Update .gitignore
Delete .project
Merge branch 'master' into develop

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/develop' into develop
fixed docs