dont depend on angularjs and some cleanup
Merge branch 'master' of github.com:collective/collective.azipfele