Merge branch 'hotfixes/0.2.1'
Preparing new release: 0.3.0
Added Celery scripts
Merge branch 'releases/0.3'
Merge branch 'master' into develop
Merge branch 'develop' of https://code.opennodecloud.com/nodeconductor/nodeconductor into develop

Conflicts:
	setup.py