Merge branch 'dev' into master

# Conflicts:
#	README.md

.gitattributes

@@ -0,0 +1,9 @@
+*.mat merge=unityyamlmerge eol=lf
+*.anim merge=unityyamlmerge eol=lf
+*.unity merge=unityyamlmerge eol=lf
+*.prefab merge=unityyamlmerge eol=lf
+*.physicsMaterial2D merge=unityyamlmerge eol=lf
+*.physicMaterial merge=unityyamlmerge eol=lf
+*.asset merge=unityyamlmerge eol=lf
+*.meta merge=unityyamlmerge eol=lf
+*.controller merge=unityyamlmerge eol=lf

.gitignore

@@ -1,17 +1,17 @@
+*/Library
+*/Assets/UnityVS
+*/Temp
+*/obj
+*/Assets/UnityVS.meta
+*/.vs
+*/_Resharper.*
+*/.idea
+*/Logs
 
-/example/Library
-/example/ProjectSettings
-/example/Temp/CaseSensitiveTest
-/example/Temp/WindowsLockFile
-/example/Temp
-/example_project/Library
-/example_project/Assets/UnityVS
-/example_project/Temp
-/example_project/obj
-/example_project/*.suo
-/example_project/*.DotSettings
-/example_project/Assets/UnityVS.meta
-/example_project/*.unityproj
-/example_project/.vs
-/example_project/_Resharper.*
+*/Assets/Plugins/Editor/Jetbrains/**
+*/Assets/Plugins/Editor/Jetbrains.meta
 
+*.DotSettings
+*.DotSettings.user
+*.unityproj
+*.suo