update few files
Merge branch 'master' of github.com:neonatas/CCKPhoto