Release 1-4

Release Notes:
- Added links to Places with websites
- Lots of refactoring