Added JUnit tests for Database
Merge branch 'dev' of https://github.com/sandyimu/EDUkid into dev

Conflicts:
	EDUkid/src/bu/edu/cs673/edukid/settings/category/AddWordView.java