Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
Merge remote-tracking branch 'origin/develop'
preparing for release 0.0.12
Merge branch 'refs/heads/develop'

Conflicts:
	recommends/__init__.py
added test-requirements
Merge branch 'refs/heads/develop'

Conflicts:
	.travis.yml
	test-requirements.txt
neevermind
Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
last one