small changes in the baseadapter
Merge branch 'master' of https://github.com/tanevanwifferen/HumanTechnologyInteraction

Conflicts:
	gen/android/support/v7/appcompat/R.java