checking in Bug fixes.  Fixed issue with locations page not working

Signed-off-by: ZackB <zack@irongatecreative.com>
Merge branch 'master' of https://github.com/zabishop/ILC_v2

Signed-off-by: ZackB <zack@irongatecreative.com>

Conflicts:
	wp-content/themes/ilc_custom_theme/js/menus.js