Merge branch 'dev' into Ark
Update TODO.md
Modify
Merge branch 'Ark' into dev

Conflicts:
	iCoffee/iCoffee/Controller/Bean/ICBeanDetailViewController.m
	iCoffee/iCoffee/Controller/Bean/ICBeanViewController.m