update to latest dev code
Merge remote branch 'origin/master'

Conflicts:
	application/config/database.php
	application/controllers/home.php
	application/controllers/security.php
	application/views/page/lists.php
	application/views/parts/header.php