Merge pull request #3 from petiteargen/master

Fixed Picky
Added inventory initialization by reading a configuration file.
V.3.1.N. Stuff!
Merge branch 'master' of https://github.com/dieg0-/mas-2014ws-project

Conflicts:
	src/station/PickerAgent.java
V.3.2.N.00.B. A lot of changes and stuff.
Fixed merging issues