Add posibility to merge environment with *.properties
Fix environment files regex
Merge pull request #302 from eroshenkoam/master

Add posibility to merge environment with *.properties