Adjust pixman submodule URL
Merge branch '1.0'

Conflicts:
	.gitmodules
Adjust simpleini submodule URL