typos
Merge branch 'master' of https://github.com/tempo-project/tempo
Merge branch 'master' of https://github.com/tempo-project/tempo
fix conf for imagineBundle
Merge branch 'master' of https://github.com/tempo-project/tempo
fix CS
Merge branch 'master' of https://github.com/tempo-project/tempo
Add file