Uncomited Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Orienteering/src/Specs
	Orienteering/src/jp/co/worksap/global/Orienteering.java