Merge branch 'master' of https://github.com/ghostnguyen/3a-flickr-sync-deploy

Conflicts:
	3A_flickr_sync.application
	Application Files/3A_flickr_sync_1_0_0_14/3A_flickr_sync.application
	Application Files/3A_flickr_sync_1_0_0_14/3A_flickr_sync.exe.deploy
	Application Files/3A_flickr_sync_1_0_0_14/3A_flickr_sync.exe.manifest
	publish.htm