theme work in progress….
resolve conflicts...
Merge branch 'master' of https://github.com/khanjeee/kmdc

Conflicts:
	application/views/admin/master.php
	forum/cache/sql_04693cf04f509618e979ce8e03351aa1.php
	forum/cache/sql_6aec56f0dfa1e29e034e8ab7940b754e.php
	forum/cache/sql_99818ef548a8e204c1389549b2dd2c1c.php