Merge branch 'stable'

michaelklishin · michaelklishin · commit 220752f145ee · 2016-07-07T12:38:55.000+03:00
diff --git a/.gitignore b/.gitignore
@@ -48,6 +48,7 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+*.lock.json
 
 # Visual Studio profiler
 *.psess
