Carrier wave and devise adjustments
Merge conflict resolved
Fix application view
Update gitignore