schema update
fixes tests
removes pending tests
fixes merge conflicts
working on carrierwave
adds image uploader
adds error/notification messages