fixing theme adminlte
Merge origin/master