Added Controller to Navigation to highlight active link
Merge remote-tracking branch 'origin/Image-Gallery' into Image-Gallery