Revert changes in tests
Merge branch '3.8'

Conflicts:
	tests/classes/PhraseanetPHPUnitAbstract.php
Merge branch 'master' of github.com:alchemy-fr/Phraseanet
Fix unit tests
Add token entities
Bump to version 3.9.0-alpha.15