Merge pull request #27 from rishy/master

merge remote tracking
enter site navigation changed