Updated config files paths
Added web server and rdbms requirements
Merge remote-tracking branch 'upstream/master'