Changing name of navigation id to main-navigation for skip links to avoid naming conflict.
Merge branch '7.x-2.x' of github.com:SU-SWS/open_framework into 7.x-2.x