some idea on ordering, fml
...
Merge branch 'master' of https://github.com/lohipas/pukutilaus

Conflicts:

Symfony/src/Custom/BootstrapBundle/Resources/views/Default/test.html.twi
g