Created single machines for each server: database and cache
Merge remote-tracking branch 'origin/Sprint-1' into Sprint-1