add 'grunt staging' task : deploys to s3 in a folder with the current branch name
Update NPM Shrinkwrap
Merge branch 'refs/heads/develop' into feature/learn