wef
Merge branch 'master' of https://github.com/ameenudeen/FileHaven.git

Conflicts:
	FileHaven_2.4/src/database/DB.java