Google Sky Integration
separation
space map in place
merge conflicts solved
Done fitler modal
Merge branch 'develop' into reconfigurePages

* develop:
  Done fitler modal
  separation
  Google Sky Integration
ready for James