Merge branch 'develop' into master

notzippy · web-flow · commit 4043cb79bc98 · 2017-07-14T11:32:22.000-07:00
diff --git a/README.md b/README.md
@@ -4,9 +4,9 @@
 
 A high productivity, full-stack web framework for the [Go language](http://www.golang.org).
 
-Current Version: 0.17.0 (2017-07-11)
+Current Version: 0.18.0-dev (2017-07-11)
 
-**As of Revel 0.15.0, Go 1.7+ is required.**
+**As of Revel 0.15.0, Go 1.6+ is required.**
 
 ## Quick Start
 
diff --git a/version.go b/version.go
@@ -6,7 +6,7 @@ package revel
 
 const (
 	// Version current Revel version
-	Version = "0.17"
+	Version = "0.18-dev"
 
 	// BuildDate latest commit/release date
 	BuildDate = "2017-07-11"
