fixing conflicts
Merge pull request #4 from thesleuth/7.x-2.x-dev

fixing conflicts