Do not pin version in setup.py
Merge branch 'develop' into trekking_json_view_migration

Conflicts:
	conf/buildout.cfg