Merge branch 'master' into dev

rebar.config

@@ -27,5 +27,5 @@
 	{gproc, "0.4.*", {git, "git://github.com/uwiger/gproc.git", {branch, "master"}}},
 	{lager, ".*", {git, "git://github.com/basho/lager.git", {branch, "master"}}},
 	{esockd, "2.*", {git, "git://github.com/emqtt/esockd.git", {branch, "master"}}},
-	{mochiweb, ".*", {git, "git://github.com/slimpp/mochiweb.git", {branch, "master"}}}
+	{mochiweb, ".*", {git, "git://github.com/emqtt/mochiweb.git", {branch, "master"}}}
 ]}.