added gitattributes for git merge
applied hot fix conversion bug (Test)
added files
Merge branch 'master' into production