small change
add column type to orders
small fix
added lager
fix conflict
fixed 2 small bugs
added price to article history
small fix for API
small change in JSON
small change in JSON
still at Lager
added raise to import
fixed bug
removed price from consumption of articles in order
fixed conflicts