Fix admin TP
Fixed restrain stuffs
Merge pull request #133 from buddytex/Dev

Fix TP and Restrain