Merge pull request #206 from raviosc/developer166

Developer166
changes done by dev20 for navigation
Merge pull request #207 from raviosc/developer20

changes done by dev20 for navigation
changes on local css
Merge remote branch 'origin/master'