Bugfix: Github issue #649.
Issue with psds and smart sprite sheets.
Republishing for a unchanged already published smart spritesheet caused the fllelookup to be overwritten without the renaming rules.
Solution: Sprite sheet operation create an intermediate filelookup file in the smartsheet folder which is then loaded and merged with all other lookups and intermediate lookups.
Intermediate filelookups are deleted if smartsheet flag is removed from folder.
Merge pull request #661 from NickyWeber/bugfix/1.1/#649_psd_filelookup_issue

Bugfix: Github issue #649 for 1.1
Merge branch 'v1.1' into bugfix/1.1/#664_release_publish_optipng

Conflicts:
	SpriteBuilder/ccBuilder/CCBPublisher.m
	SpriteBuilder/ccBuilder/PublishImageOperation.m