Renamed the Agent.java file to Marketeer.java because the class it contains is called Marketeer
Merge branch 'master' of https://github.com/WouterVeen/JadeMarktplaats

Conflicts:
Merge branch 'master' of https://github.com/WouterVeen/JadeMarktplaats