Made dialog canceleable
Merge branch 'master' into jason
added cancel button instead of just making it canceleable
Merge pull request #147 from calblueprint/jason

Jason