Merge branch 'Ark' into dev
merge
merge
merge
update todo
Merge branch 'Ark' into dev

Conflicts:
	iCoffee/iCoffee/Controller/Bean/ICBeanDetailViewController.m
	iCoffee/iCoffee/Controller/Bean/ICBeanViewController.m
solve conflict
merge
update
update
update
update todo
update
update find
update
update
update overlapping
Merge branch 'dev' into Ark

Conflicts:
	TODO.md