Merge pull request #12 from ARGOeu/devel

Sprint 22 Release
Merge pull request #14 from andronat/site_calc_to_new_ap_schema

Site calc to new ap schema
Merge branch 'master' into devel
Fixes needed for local type of calculations
Merge pull request #29 from pkoro/local_fixes

Fixes required for local (not cluster) mode