Merge remote-tracking branch 'refs/remotes/origin/1.0'
fixed composer.json
Merge branch 'refs/heads/1.0'
Merge branch 'refs/heads/1.0'
Merge remote-tracking branch 'refs/remotes/origin/1.0'
Merge remote-tracking branch 'refs/remotes/origin/1.0'
Merge remote-tracking branch 'origin/1.0'
Merge remote-tracking branch 'origin/1.0'
Added sonata translation helper
Merge pull request #4 from awesemo/patch-4

Added sonata translation helper
Merge remote-tracking branch 'origin/master' into 1.0
fixed composer from merge