merge
Added initial data generator, simple market simulation.
Merge branch 'Baszczyk' into Mucha
merge Mucha with controllers fixes
minor syntactic fix
minor fixes
added communication with database in generator