Fixed migrations.
Merge branch 'staging' of github.com:Orasi/blue-source into staging

Conflicts:
	db/schema.rb