committing bookmanager to be able to merge
trying to commit in order to merge
Merge branch 'master' of https://github.com/maicf/ARClient

Conflicts:
	application/BookManager.class.php
Merge branch 'master' of https://github.com/maicf/ARClient