update
Merge branch 'master' of https://github.com/khiemvu/ATA
update book service
Merge branch 'master' of https://github.com/khiemvu/ATA

Conflicts:
	res/layout/ata_fleet.xml