Nick's commit
Merge branch 'master' of https://github.com/jaeros/firearm_listing
Fix z index of search button
Merge branch 'master' of https://github.com/jaeros/firearm_listing