Version bump.
Added Photoshop files with block and item textures (mostly as backup, but some people might find them useful as a basis for their own textures or for re-texturing OC).
Merge branch 'master' of github.com:MightyPirates/OpenComputers into MC1.7

Conflicts:
	build.properties