fix page
Merge branch 'master' of https://github.com/studiokami/wbdps

Conflicts:
	application/views/gp/page/page.php