Update fixtures to include translation ids (issue #27)
Merge pull request #28 from JoakimLofgren/fix-fixtures-issue

Update fixtures to include translation ids
fix locale not contains filter
add text filter
Merge pull request #31 from Kunstmaan/fix_translator_filter

Fix translator filter
Merge branch 'master' into 2.3

* master: (24 commits)
  add text filter
  fix locale not contains filter
  fix filtering functionality in translation editor
  Update fixtures to include translation ids (issue #27)
  fix the translations edit page
  check that it is possible to edit the translation inline
  update upgrade doc
  upgrade instructions
  enforce phpunit 3.x to fix code coverage on php 5.3
  fix diff command
  fix tests
  admin list with inplace edit / delete / add support
  add french translations
  inline editing done
  make it possible to translate error messages
  Update README.md
  Removed var_dumps, 🐱
  add missing license file...
  Spanish translations
  Update composer.json
  ...

Conflicts:
	composer.json
Merge branch '2.3' of git://github.com/Kunstmaan/KunstmaanTranslatorBundle into 2.3

* '2.3' of git://github.com/Kunstmaan/KunstmaanTranslatorBundle:
  travis.yml