a
Merge branch 'master' of https://github.com/DavidSalzer/reshet-static

Conflicts:
	js/filter.js
	js/jquery-1.9.1.js
	js/jquery-1.9.1.min.js
	js/recipePageManager.js
	js/script.js
	js/xgemius.js