Login Back office + gift
Merge branch 'master' of https://github.com/lazywrath/bookfaker

Conflicts:
	application/models/entities/User.php