Revert 9df6082..3c705ea

This rolls back to commit 9df6082e5ea13d5013e3528e2f16fd76b1721c6d.
Revert 63fc236..08794d6

This rolls back to commit 63fc23674e71d118be6820a54d257afc20394b89.
Revert 3c705ea..f02e817

This rolls back to commit 3c705ea881a18836cdd4fa496ae8cfc30beaace8.
updated based on Harry's new assets
Merge branch 'master' of https://github.com/camb416/Poison_2013

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