Merge branch 'master' of https://github.com/kmeenareddy/test2

Conflicts:
	test/devdb.properties
Merge branch 'master' of https://github.com/kmeenareddy/test2

Conflicts:
	test/devdb.properties