Merge branch 'development' of git://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into CrazyHacks
Merge branch 'development' of git://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into CrazyHacks
Merge branch 'development' of git://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into CrazyHacks
Merge branch 'development' of git://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into CrazyHacks
Deleted obsolete logmessage
Merge branch 'development' of git://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into CrazyHacks
Merge branch 'development' of git://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into CrazyHacks
Merge branch 'development' of git://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into CrazyHacks
Merge branch 'Mike-ParallelBehaviours' of git://github.com/hesselmeulenbeld/HUniversal-Production-Utrecht into CrazyHacks
Added DoxyGen comments
Merge branch 'CrazyHacks' of bitbucket.org:theodoor/product-agents

Conflicts:
	src/java/rexos/mas/productAgent/InformerBehaviour.java
	src/java/rexos/mas/productAgent/ProduceBehaviour.java
Delete LogMessage
Merge branch 'CrazyHacks' of bitbucket.org:theodoor/product-agents
Adde dDoxyGen comments
Merge branch 'CrazyHacks' of https://bitbucket.org/theodoor/product-agents into development

Conflicts:
	src/java/rexos/mas/productAgent/OverviewBehaviour.java
	src/java/rexos/mas/productAgent/ProductAgent.java
	src/java/rexos/mas/productAgent/SideOverviewBehaviour.java