implemented carrierwave and cancan, cancan not complete
merge from master with conflicts in models/user.rb resolved