Merge with nazly
merge with usptream
merge with usptream
Adding carrerwave and image uploading
More updates
merge with upstream