Resolving conflicts
layout admin - fixing css of the header
Merge branch 'master' of github.com:hacklabr/timtec