bugfixes
Merge branch 'master' of git://github.com/itedev/CMF-JSBundle