add logging
Merge branch 'master' of github.com:tetrapods/core

Conflicts:
	Tetrapod-Tetrapod/src/io/tetrapod/core/TetrapodService.java