Bumped version
Version bump
Merge branch 'master' into develop

Conflicts:
	flatcat/__init__.py