V.3.1.N. Stuff!
Merge branch 'master' of https://github.com/dieg0-/mas-2014ws-project

Conflicts:
	src/station/PickerAgent.java