.
Merge branch 'master' into working_branch
colorbox
.
Merge pull request #65 from eugenefilimonov/working_branch

Working branch/colorbox