pull
Merge branch 'master' of http://github.com/egiw/BKPM
Merge branch 'master' of http://github.com/egiw/BKPM

Conflicts:
	application/layouts/layout.phtml
pull
Merge branch 'master' of http://github.com/egiw/BKPM
Merge branch 'master' of http://github.com/egiw/BKPM
refine