added basic testing part
minor template restructuring
moved observatory to a submodule
Merge branch 'devel'