first commit
last update
Merge branch 'master' of https://github.com/gcovolan/datamapper

Conflicts:
	.htaccess
	application/config/hooks.php
	application/controllers/manager/home.php
	application/libraries/layout.php