created new build
created new build
Merge branch 'feature/preview' of git://github.com/sulu-cmf/SuluAdminBundle into feature/preview
Merge branch 'feature/preview' of git://github.com/sulu-cmf/SuluAdminBundle into feature/preview
started fixing toolbar bug
solved merge confilcts