Add requirements file
Merge branch 'devel'
Resolve merge conflict