Merge branch '7.x-3.x' of github.com:ThemeGeeks/Omega into 7.x-3.x