Merge branch 'integration'
ignore ._* files
Merge branch 'master' of github.com:andrrr/scaffolds