2.2
2.4
Merge https://github.com/utolosa002/BerziklApp

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/HondakinActivity.apk
	bin/classes.dex
	bin/classes/gipuzkoa/hondakinak/DatabaseHandler.class
	bin/classes/gipuzkoa/hondakinak/HondakinActivity$1$1.class
	bin/classes/gipuzkoa/hondakinak/HondakinActivity$1.class
	bin/classes/gipuzkoa/hondakinak/HondakinActivity$2.class
	bin/classes/gipuzkoa/hondakinak/HondakinActivity$3.class
	bin/classes/gipuzkoa/hondakinak/HondakinActivity$4.class
	bin/classes/gipuzkoa/hondakinak/HondakinActivity$5.class
	bin/classes/gipuzkoa/hondakinak/HondakinActivity$6.class
	bin/classes/gipuzkoa/hondakinak/HondakinActivity.class
	bin/classes/gipuzkoa/hondakinak/hMotaHautatua$1.class
	bin/classes/gipuzkoa/hondakinak/hMotaHautatua$2.class
	bin/classes/gipuzkoa/hondakinak/hMotaHautatua.class
	bin/res/crunch/drawable-hdpi/ic_launcher.png
	bin/res/crunch/drawable-mdpi/ic_launcher.png
	bin/res/crunch/drawable/ikonohandia.png
	bin/resources.ap_
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable/ikonohandia.png
	src/gipuzkoa/hondakinak/DatabaseHandler.java
	src/gipuzkoa/hondakinak/HondakinActivity.java
	src/gipuzkoa/hondakinak/hMotaHautatua.java
2.4