version increment
Merge branch 'master' of github.com:shstefanov/infrastructure
Merge branch 'master' of github.com:shstefanov/infrastructure
Merge branch 'master' of github.com:shstefanov/infrastructure
Merge branch 'master' of github.com:shstefanov/infrastructure
Merge branch 'master' of github.com:shstefanov/infrastructure
Merge branch 'master' of github.com:shstefanov/infrastructure
cleaning client/collection.coffee
resolving merfe conflicts