initilazition by HP-PD
Merge branch 'cs6' of github.com:taballa/photoshop into cs6

Conflicts:
	Adobe Photoshop CS6 Settings/Actions Palette.psp
	Adobe Photoshop CS6 Settings/Color Settings.csf
	Adobe Photoshop CS6 Settings/LaunchEndFlag.psp
	Adobe Photoshop CS6 Settings/PluginCache.psp
	Adobe Photoshop CS6 Settings/WorkSpaces (Modified)/Essentials
	Adobe Photoshop CS6 Settings/Workspace Prefs.psp

Signed-off-by: taballa.hp-PD <taballa@gmail.com>