xml settings
Merge branch 'touchvideo-dev' of https://github.com/camb416/Poison_2013 into touchvideo-dev

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