From 6f40ad05588612d02dad222fad6da4364b446278 Mon Sep 17 00:00:00 2001
From: Pan Luo <pan.luo@ubc.ca>
Date: Fri, 17 Oct 2014 13:43:06 -0700
Subject: [PATCH] Bump version 3.1.4

---
 app/config/core.php | 2 +-
 readme.md           | 8 ++++++++
 version.txt         | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/config/core.php b/app/config/core.php
index 2cb7ad734..1750a7d51 100644
--- a/app/config/core.php
+++ b/app/config/core.php
@@ -342,7 +342,7 @@
   $CWL['applicationID'] = '';
   $CWL['applicationPassword'] = '';
 
-  define('IPEER_VERSION', '3.1.3');
+  define('IPEER_VERSION', '3.1.4');
 
 
 /**
diff --git a/readme.md b/readme.md
index 5721fa2e2..3247d8fc1 100644
--- a/readme.md
+++ b/readme.md
@@ -70,6 +70,14 @@ Runing the tests:
     cake/console/cake -app app testsuite app group system
 
 It is better not to touch the mouse or keyboard during the tests.
+iPeer 3.1.4
+---------------------------
+This is a maintenance release.
+* Increase the script exec time on export action
+* removed disabling edit group buttons when submissions have already
+* added pseudo data for rubric view
+* fixed broken link for adding survey questions when using
+* added individual criterion comments to the rubric csv export
 
 iPeer 3.1.3
 ---------------------------
diff --git a/version.txt b/version.txt
index ff365e06b..0aec50e6e 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-3.1.3
+3.1.4