set version number
Merge branch 'master' into stable/0.1.x

Conflicts:
	setup.py
Merge branch 'master' into stable/0.1.x
bumb version and update changelog
Merge branch 'master' into stable/0.1.x
bump version
add tox confix
Merge branch 'master' into stable/0.1.x

Conflicts:
	CHANGES
	setup.py
	tox.ini
keep master as alpha stage