fixed version constant
increased version
Merge branch '1.0'

Conflicts:
	JMSTranslationBundle.php
updated version in test files
fixed Twig dependency
fix composer for symfony 2.2
Merge pull request #75 from gimler/patch-2

fix composer for symfony 2.2
The Desc attribute can now be one line before call to trans or transChoice. The same applies to forms.
Merge pull request #76 from mvrhov/DescBefore

The Desc attribute can now be one line before call to trans or transChoice. The same applies to forms.
relaxes conflicting twig versions
adds ability to extract translations for multiple locales at once
adds filename to parser error (closes #92)
Committing pas deloup's fix: https://github.com/schmittjoh/JMSTranslationBundle/issues/95
Add blank lines.
Merge pull request #98 from cc-consulting/master

Fix for issue #95
Use the X-HTTP-METHOD-OVERRIDE header to specify PUT.
Merge pull request #100 from cc-consulting/master

Fix for #99
Update Translation/ExtractorManager.php

setDirectories is in fact adding directories not setting them
fixes #97
Merge pull request #102 from tkleinhakisa/master

Fixe scan directories multiple times
Merge of messages is now optional