bower angular resolving
Merge branch 'master' into vendorProfile2