Readme update and new apache config
Merge branch 'master', remote-tracking branch 'origin' into UI_DEV