....
Merge branch 'raspberry' of https://github.com/Ormazz/kercart2-2013 into raspberry

Conflicts:
	KerCarRaspberry/src/kercar/raspberry/core/JapaneseTourist.java