.
Merge branch 'master' of https://github.com/KitchApp/KitchApp-Web

Conflicts:
	sites/all/modules/buy_list/buy_list.module