c
Merge branch 'master' into juan

Conflicts:
	TruePhoto/TruePhoto.v12.suo
	TruePhoto/TruePhoto/TruePhoto.csproj
	TruePhoto/TruePhoto/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Merge branch 'master' into juan
Merge branch 'master' of https://github.com/alankalter/TruePhoto into juan

Conflicts:
	TruePhoto/TruePhoto/bin/TruePhoto.dll
	TruePhoto/TruePhoto/bin/TruePhoto.pdb
	TruePhoto/TruePhoto/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TruePhoto/TruePhoto/obj/Debug/TruePhoto.csproj.FileListAbsolute.txt
	TruePhoto/TruePhoto/obj/Debug/TruePhoto.dll
	TruePhoto/TruePhoto/obj/Debug/TruePhoto.pdb
my changes
new commit
commit
upload page
upload page
upload page
Merge pull request #4 from alankalter/juan

Juan