No important
add in gitignore
Resolve conflict
Change Json format to view exhibit
Resolve conflicts
Resolve conflicts
resolve conflict in exhib controler
fix merge
Merge Dev
Merge branch 'master' of github.com:hermanos/audioguide into pixies
Add language field to Exhibit
Exhibit create language select option