fixed check marks in orgs and progs
Merge branch 'master' into dev
changed to time frame in program show
changed time frame formatting
Merge branch 'master' of https://github.com/sankalpk/gelfand