Merge branch 'android' of i14git.anthropomatik.kit.edu:bvs/bvs into android

* 'android' of i14git.anthropomatik.kit.edu:bvs/bvs:
  android: fix typo in bvs.conf
Merge branch 'android' of i14git.anthropomatik.kit.edu:bvs/bvs into android

* 'android' of i14git.anthropomatik.kit.edu:bvs/bvs:
  android: fix some problems with libc on android
android: second activity to select different configs
android: moved configfile into android/assets/conf/
Merge branch 'android' of i14git.anthropomatik.kit.edu:bvs/bvs into android

* 'android' of i14git.anthropomatik.kit.edu:bvs/bvs:
  android: moved configfile into android/assets/conf/
  android: second activity to select different configs
android: cleanup imports, Logs
readme: add section about license and research
android: remove config from old location
readme: various fixes
Merge branch 'android' into devel

* android:
  android: remove config from old location
  android: cleanup imports, Logs
  android: moved configfile into android/assets/conf/
  android: second activity to select different configs
changelog: multidroid [2013.5]
Merge branch 'devel'

* devel:
  changelog: multidroid [2013.5]
  readme: various fixes
  android: remove config from old location
  readme: add section about license and research
  android: cleanup imports, Logs
  android: moved configfile into android/assets/conf/
  android: second activity to select different configs