FTS-11: Added pool_recycle parameter when creating the SqlAlchemy engine
Raised version to 0.0.7
Merge branch 'master' into stage

Conflicts:
	dist/fts-rest.spec
Removed references to t_file.activity

Not yet in stage branch of fts3
Versioning follow FTS3
Merge branch 'develop' into stage

Conflicts:
	dist/fts-rest.spec
	dist/python-fts.spec
	src/fts3rest/fts3rest/controllers/jobs.py
	src/fts3rest/fts3rest/tests/functional/test_jobs.py
Accidentaly left a conflict marker