All in one jar#2

ninovasc wants to merge 2 commits intomasterAngra-DB/client:masterfrom

all-in-one-jarAngra-DB/client:all-in-one-jarCopy head branch name to clipboard