Addresses

Merge Addresses into master.
This adds address as entity into the database.