first roll back
Merge branch 'master' of https://github.com/martin-lim/JAQ

Conflicts:
	JAQ.atsuo