added Theo's changes for SYNC
touched up main activity and view question
Merge remote-tracking branch 'upstream/elasticSearchDev' into elasticSearchDev
Merge pull request #321 from jivedesign/elasticSearchDev

Elastic search dev