Merge Admin :: master

this is the first beta version after split and clear the program code