Upgrade to AngularJs 1.6