Merge branch 'master' of Z:\home\localhost\www\manageurldev with conflicts.
css styles