Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/backbone.sails.coffee
	docs/0.1/Backbone.Sails.Model.md
Merge remote-tracking branch 'origin/master'