Modules and Flexslider Stuff
Merge branch 'master' of https://github.com/mhettler/accuratelockandhardware.com

Conflicts:
	sites/all/themes/alhx/templates/page--front.tpl.php