fixed merge issue
merge issues
changed carrierwave, changed views abit
more front end changes
fixed merge conflicts from cenderin