Begin merge between AdminLTE and new theme for COS7