Mike Rosseel b040582f87 Merge branch 'Development' into issue544-api ... # Conflicts: # pom.xml		2016-10-16 12:18:33 +02:00
..
src	Merge branch 'Development' into issue544-api	2016-10-16 12:18:33 +02:00
pom.xml	offer_make / cancel works (some things still hardcoded)	2016-09-20 22:14:27 +02:00