:octocat: Added .gitattributes & .gitignore files
Merge branch 'master' into devel
13072014-1648
Merge branch 'devel'