Merge branch 'master' of https://github.com/nirvanarico/pics-client-branding.git