Issue 3

Replace location and Moscone by Venue(src no string/json) 
![device-2014-08-09-193431](https://cloud.githubusercontent.com/assets/475733/3867049/3022e868-1fed-11e4-8f32-3da54099210f.png)