c
Merge branch 'master' of https://github.com/andikacsui/TheExplorer

Conflicts:
	src/project/TheExplorer/Database/DatabaseHelper.java