Update Master v.2 (merge Develop)
Add model -> spec
Merge branch 'master' of github.com:hermanos/audioguide
Fix Pixies after Stash from Master
Update from Develop
Unstash :-)
Update Dev again...
Update Dev v.3
fix deployment
fix unicorn
Merge branch 'develop' of h.github.com:hermanos/audioguide
Merge branch 'master' of h.github.com:hermanos/audioguide
test
test json
test json
User Tests
Update master from Dev