Merge remote-tracking branch 'origin/master'

Conflicts:
	SocialLearning/apps/learningobjects/management/commands/crawler.py
conflictos arreglados, creo :S
Merge remote-tracking branch 'origin/master'

Conflicts:
	SocialLearning/apps/learningobjects/management/commands/crawler.py
	SocialLearning/apps/learningobjects/migrations/0001_initial.py
	SocialLearning/templates/rest_framework/base.html