Updated git
Updated grunt
updated grunt
update grunt dist
Updated theme
Added new theme framework
Updated git ignore
Updated git
Merge branch 'release-dev' into release-design

Conflicts:
	.gitignore
Update git
Added search scripts
Added new plug-in
Updated travel search page
Grunt update
Merge branch '5461524ff64395554e9255bd' into release-dev
5461524ff64395554e9255bd Integrate search filters into Gear and Travel pages
Updated template
updated template
Updated travel template
Merge branch 'release-dev' into release-design

Conflicts:
	wp-content/themes/kiteworldmagazine/custom/main-travel-page.php