fixed race condition and removed bad css link
update angular to 1.3.5
Merge branch 'angular_upgrade' into testing