add fixes
add angularjs to project
fix conflict