No demo data.
Merge branch 'master' of https://github.com/jeanleonino/AdminLTE

Conflicts:
Small fix.