New menu.
Merge branch 'master' of https://github.com/jeanleonino/AdminLTE

Conflicts:
	css/theme.css