xml update
Merge branch 'master' of https://github.com/camb416/Poison_2013

Conflicts:
	RFIDBook/bin/data/settings/book.xml