Merge branch 'master' into update

.gitattributes

@@ -0,0 +1,28 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
+
+# Declare text file types just in case
+*.java text
+*.yml text
+*.xml text
+*.md text
+
+# Image files are treated as binary by default
+#*.jpg   binary
+#*.png   binary
+#*.gif   binary