Added p2ptrade test script that uses the server code. Made everything work right up to actually broadcasting the transaction for both p2ptrade-test.py and p2ptrade-net-test.py.
Small change to app.py's serialization script to make the object that it outputs unpack all at once
Merge branch 'color' of git://github.com/vbuterin/BitcoinArmory into color

Conflicts:
	extras/p2ptrade-test.py
	p2ptrade.py
configurable test color
app.py moved to extras