carrier wave and validation
update merge conflicts