fix some karma tests problems
fix dependencies
refactor controller code to controller from directive
added angular controllers to grunt watch
finished refactor