bower 1.3.3 -> 1.3.6, and new npm-shrinkwrap.json
Merge pull request #1349 from jrgm/update-bower-on-master

bower 1.3.3 -> 1.3.6, and new npm-shrinkwrap.json