update
Merge branch 'master' of https://github.com/Tolia/clipped.angular.js