edited .gitignore
Merge branch 'hotfix/VERSION2'

edited .gitflow to ignore /modules