images,scripts, styles paths modified.
Merge remote-tracking branch 'origin/admin'