Larger/better looking launcher icon, added icon_myflyer.png
Eclipse project properties
Merge remote-tracking branch 'origin/master'

Conflicts:
	GroceryOTG/project.properties