20130513
Merge branch 'master' of ssh://github.com/shigenobu/tlo

Conflicts:
	obj/tloConfig.xml