Roll back
jhg
Merge branch 'kikaandBr1' of https://github.com/N4gato/Kika-android into kikaandBr1

Conflicts:
	gen/com/light/kika/R.java
	res/layout/activity_main.xml
	src/com/light/kika/Liste.java
	src/com/light/kika/MainActivity.java
Merge branch 'kikaAndbr1'
merge solving problemes