merge in 1.1.4 changes into develop branch for 1.2 release.

CHANGELOG.md

@@ -6,6 +6,7 @@ See VERSIONING (https://github.com/openMF/mifosx/blob/master/VERSIONING.md) for
 Releases
 ===============
 
+1. 24 May 2013 - 1.1.4.RELEASE
 1. 22 May 2013 - 1.1.3.RELEASE
 1. 19 May 2013 - 1.1.2.RELEASE
 1. 12 May 2013 - 1.1.1.RELEASE
@@ -20,6 +21,18 @@ Releases
 1. 05 April 2013 - 0.11.1.beta
 1. 05 April 2013 - 0.11.0.beta
 
+1.1.4.RELEASE
+=============
+Bug Release
+
+Platform & API
+ - [MIFOSX-387] - Loans template for Client not showing currencies
+
+Reference App
+ - [MIFOSX-382] - In Change Loan Application by changing the "Product" name, Details are not getting updated (ie, in Terms & settings),since "currencies" of two loan products are different
+ - [MIFOSX-390] - Regression in ability to associate a fund with a loan application through reference app
+
+
 1.1.3.RELEASE
 =============
 Bug Release

README.md

@@ -26,7 +26,7 @@ The mifos-platform (project named 'Mifos X') has reached <b>public release versi
 
 That means there is a published and stable API. This API is documented in the api-docs under <b>Full API Matrix</b>.
 
-Latest stable release: <a target="_blank" href="https://github.com/openMF/mifosx/tree/mifosplatform-1.1.3" title="mifosplatform-1.1.3">mifosplatform-1.1.3</a>
+Latest stable release: <a target="_blank" href="https://github.com/openMF/mifosx/tree/mifosplatform-1.1.4" title="mifosplatform-1.1.4">mifosplatform-1.1.4</a>
 
 License
 =============

api-docs/apiLive.htm

@@ -90,7 +90,7 @@
 <body>
 	<div id="page-wrapper">
 		<div id="flybar">
-			<div id="nav-logo">1.1.3.RELEASE API</div>
+			<div id="nav-logo">1.2.0.RELEASE API</div>
 			<div class="flybar-nav">
 				<h2 class="flybar-button">Overview</h2>
 				<div class="flybar-menu-overview">

mifosng-provider/gradle.properties

@@ -1 +1 @@
-releaseVersion=1.2.0.RELEASE
+releaseVersion=1.2.0.RELEASE