update
daily update
final daily update
update
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/BeerCellar.apk
	bin/classes.dex
	bin/resources.ap_
	res/layout/main.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/BeerCellar.apk
	bin/classes.dex
	bin/resources.ap_
	res/layout/main.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/BeerCellar.apk
	bin/classes.dex
	bin/resources.ap_
	res/layout/main.xml