changes due to admin lte theme changes
Merge branch 'master' into develop