Location selector: fix crash with unicode instances returned from json.loads
Assets: Start work on Telephone Type
Merge branch 'master' of git://github.com/nursix/eden