Merge branch 'master' of github.com:socialize/bootstrap-rest