fixing activity creation to access db
Merge branch 'master' of https://github.com/itpun/java into itpun-master

Conflicts:
	src/gui/CourseSelection.java