-- minor modifications and optimizations
-- update for paper of isr
Merge branch 'tmp_branch' into pull_request

Conflicts:
	applications/tsd_xtion_camNano.cpp