Improvements

Added support of complex geolocation properties #5
Updated for templates
Moved ATMs to separate category
Fixed small issues with charts