Manually merge branch 'feature/move-harness-to-cmd' into develop

Conflicts:
	revel/test.go

revel/build.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 
 	"github.com/revel/revel"
-	"github.com/revel/revel/harness"
+	"github.com/revel/cmd/harness"
 )
 
 var cmdBuild = &Command{

revel/run.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"github.com/revel/revel"
-	"github.com/revel/revel/harness"
+	"github.com/revel/cmd/harness"
 	"strconv"
 )
 
@@ -59,11 +59,13 @@ func runApp(args []string) {
 
 	// If the app is run in "watched" mode, use the harness to run it.
 	if revel.Config.BoolDefault("watch", true) && revel.Config.BoolDefault("watch.code", true) {
+		revel.TRACE.Println("Running in watched mode.")
 		revel.HttpPort = port
 		harness.NewHarness().Run() // Never returns.
 	}
 
 	// Else, just build and run the app.
+		revel.TRACE.Println("Running in live build mode.")
 	app, err := harness.Build()
 	if err != nil {
 		errorf("Failed to build app: %s", err)

revel/test.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/revel/revel"
-	"github.com/revel/revel/harness"
+	"github.com/revel/cmd/harness"
 	"github.com/revel/modules/testrunner/app/controllers"
 	"io"
 	"io/ioutil"