modify user layout
Add images to museums and exhibits
Add carrierwave gem
change table profiles in admin
solved other conflicts
Create uploader and change type of fields image
resolve conflicts
Extra changes for conflict
Extra changes for vs 2
a conflict
Add uploading image
Add moun_image to museum
Add upload image to exhibit
Add upload image for profile
Add upload image for achievements
Change for thumbs
Thumbs and put uploads to gitignore
Merge branch 'develop' of https://github.com/hermanos/audioguide into uploadimg
Add thumb sizes for images
Merge Develop - Pixies (CanCan)