add carousel_info field to user
Merge branch 'develop' into staging

Conflicts:
	app/models/user.rb