Changes from Volicon trunk

- bug fix for relational stuff
- experimental support for deep links