Conflict fixes

- References innoraft/ir.love.revamp#157
Merge pull request #160 from subhojit777/master

Merging seo_experiment with master branch
Conflict resolve

- Merge conflict pointers removed.
Fix menu problem.
- Make same space in left site in all pages in main menu.
- Make highlighted menu visbile.
Merge branch 'tkuldeep/1311-fix-menu-problem' of github.com:innoraft/ir.love.revamp into seo_experiment

Conflicts:
	docroot/sites/all/modules/feature_modules/f_ir_portfolio/f_ir_portfolio.views_default.inc