changes according to start on server
Merge remote-tracking branch 'origin/develop' into develop
css,js files