merge Shaman
working over units rendering into Bootstrap style
Add New Units
marge fix
marge avostudio->dkozatc_myBranch