last update
Merge branch 'conitsoc-branch' of https://github.com/samandajimmy/conitsoc into conitsoc-branch

Conflicts:
	application/controllers/page.php
	application/models/produkModel.php
	application/views/templateUser.php
	assets/user/js/customize.js