added options menu. added database get methods
Merge branch 'master' of https://github.com/Cander1336/Haiku.git

Conflicts:
	src/haiku/top/model/Word.java