Merge branch 'v2.0'
Merge branch 'v2.0'
Merge branch 'v2.0'
Merge branch 'v2.0'
Merge branch 'v2.0'
Merge branch 'v2.0'
Merge branch 'master' of github.com:cc1-cloud/cc1
Merge branch 'master' of github.com:cc1-cloud/cc1
Merge branch 'v2.0'
Merge branch 'master' of github.com:cc1-cloud/cc1

Conflicts:
	src/clm/tests/__init__.py
Merge branch 'v2.0'
Changes in packages generation
Nothing but formatting
Bugfixes in src/ec2/base/auth.py
Missing caller id added to logger
Hash fixed in CLM tokens
Merge branch 'master' into v2.0