In the process of getting "master" deployed after merging dao-impl branch into it. Few more changes are still left.