Updated dependencies
Merge branch 'master' of github.com:webrebels/web-rebels-2015