First commit.
Merge branch 'master' of github.com:signmotion/jyoti

Conflicts:
	jyoti-test/include/configure.h