changed database and apache configuration
url modified
Merge branch 'production' into shankar