Pushing
Merge branch 'develop' into reconfigurePages

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