Resolved diff with .settings directory
Merge remote-tracking branch 'github/master'
Complete - task : Why are we getting wrong DispGroup?
RESOLVED - issue VISCAT-149: Need start/end markers for the routes that
I can turn on/off 
http://jira.jettmarks.com/jira/browse/VISCAT-149