Merge branch 'master' into develop

docs/conf.py

@@ -60,7 +60,7 @@ author = u'Iuri Matias'
 # The short X.Y version.
 version = u'2.5'
 # The full version, including alpha/beta/rc tags.
-release = u'2.5.1'
+release = u'2.5.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "embark",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "Embark is a framework that allows you to easily develop and deploy DApps",
   "scripts": {
     "test": "grunt jshint && mocha test/ --no-timeouts"