WIP
Merge branch 'master' of https://github.com/bgorecki/eirkdbd.git

Conflicts:
	EiRKDBD/src/utils/DataLoader.java