Merge branch 'dev' into Ark
Add Files
Display popbutton
Merge branch 'dev' into Ark

Conflicts:
	iCoffee/iCoffee.xcodeproj/project.pbxproj
Widget update
Update
Merge branch 'Ark' into dev
update maps
update
update widget
update widget