Git
git
Merge branch 'master' of https://github.com/nickyudha/bionicorganic

Conflicts:
	admin/pages/recipes/category/index.php