style changes
Merge branch 'uf-461' of github.com:webcraft-Myplanet/unicornfactory into uf-461