Adding contextDAO
Deleting class files
Merge branch 'master' into Ash-Maint
Merge pull request #58 from ahajirnis/Controller_DAO

Adding contextDAO
Merge pull request #59 from ahajirnis/Ash-Maint

Putting GUI changes
Merge branch 'master' into GUI_Aish_Controller