Add encoding declaration
Fix some CS issues
Fix some CS issues

Conflicts:
	IntegrationTest.py
	solap4py.py