bump version
add *.cfg file to package
Merge branch 'develop' into qa

* develop:
  add *.cfg file to package
  bump version

Conflicts:
	setup.py