CanCan Achievements
Merge branch 'develop' of github.com:hermanos/audioguide into pixies
Delete shared from Achievements
Museum Show and Index
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
Add uploading image