first commit for new concept
fix template
update __toString Nav
add template sb-admin-2
update template
fix merging