Merge branch 'master' into feature/#17

Conflicts:
	app/views/exceptionhandler/index.html.erb

app/controllers/exceptionhandler_controller.rb

@@ -63,7 +63,8 @@ class ExceptionhandlerController < ApplicationController
            issue.save
            flash.now[:notice] = "New report filed: ##{issue.id}"
         else
-          flash.now[:error] = issue.errors.full_messages
+          flash.now[:error] = "There was an error with filing this report"
+          @output = issue.errors.full_messages
         end
 
         #TODO generate link to issue

app/views/exceptionhandler/index.html.erb

@@ -1,5 +1,8 @@
 <h1>Exception Handler</h1>
 <br/>
+<%= @output %>
+<br/>
+<br/>
 <strong>Number of params:</strong> <%= params.size %>
 <br/>
 <br/>
@@ -13,7 +16,3 @@
 <strong>Params:</strong>
 <br/>
 <%= params.inspect %>
-
-<br/>
-
-<%= @output %>