refactored ModelConverter and JSONConverter so they work properly with Address.contact_id circular relationship.
Merge branch 'feature/transactions' of github.com:openeyes/OpenEyes into feature/transactions