merge
Added initial data generator, simple market simulation.
Merge branch 'Baszczyk' into Mucha
fixed updateStock in userData controller
merge Mucha with controllers fixes
minor syntactic fix
Fix simulation.
minor fixes
added communication with database in generator
Merge branch 'Uszycki' into Zarnowski
minor syntactic fix
minor fix
merge Uszycki with gen/server.js fix
minor fixes
moved sell and purchase htmls from their folders to HPT/public/views
fixed purchase view infustries checkbox
Merge branch 'development', remote-tracking branch 'origin' into Mucha
Simulation fix
minor fix
added script for populating database with companies without their history