=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-07-30 09:35:52 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/org/hisp/dhis/light/i18n_module.properties	2012-09-06 18:52:44 +0000
@@ -109,4 +109,7 @@
 anomynous_program_list=Anonymous Program List
 orgunit=Organisation Unit
 change=Change
-register_location_for=Register Location For
\ No newline at end of file
+register_location_for=Register Location For
+agregate_reporting=Aggregate Reporting
+find_or_add_person=Find/Add Person
+search_by_phone_number=Search By Phone Number
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchingForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchingForm.vm	2012-05-23 13:55:43 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/enrollment/beneficiarySearchingForm.vm	2012-09-06 18:52:44 +0000
@@ -31,6 +31,7 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
+	
 	<li><a href="trackingMenu.action"> $i18n.getString("tracking_menu")</a> </li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2012-07-19 06:43:24 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/menu.vm	2012-09-06 18:52:44 +0000
@@ -20,7 +20,7 @@
 
 <p>
 <ul>
-    <li><a href="selectOrganisationUnit.action">$i18n.getString( "data_entry" )</a></li>
+    <li><a href="selectOrganisationUnit.action">$i18n.getString( "agregate_reporting" )</a></li>
     <li><a href="trackingMenu.action">$i18n.getString( "tracking" )</a></li>
     <li><a href="messages.action">$i18n.getString( "messages" ) #if($unreadMessageConversationCount > 0)($unreadMessageConversationCount)#end</a></li>
     <li><a href="reports.action">$i18n.getString( "reports" )</a></li>
@@ -31,7 +31,7 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
-    <li><a href="feedback.action">$i18n.getString("feedback")</a></li>
+    
 	<li><a href="../dhis-web-commons-security/logout.action">$i18n.getString("logout")</a></li>
     <li style="padding-top: 5px;"><a href="../">$i18n.getString("desktop_version")</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/messages.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/messages.vm	2012-01-11 09:37:08 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/messages.vm	2012-09-06 18:52:44 +0000
@@ -13,6 +13,23 @@
 </ul>
 </p>
 
+<p>
+
+<form method="POST" action="sendFeedback.action">
+<div class="header-box" align="center">
+	<h3 style="text-align: left;">$i18n.getString( "send_feedback" )</h3>
+    <p style="text-align: left;">
+        $i18n.getString( "subject" ) *<br />
+        <input type="text" maxlength="255" size="24" name="subject" />
+
+        $i18n.getString( "text" ) *<br />
+        <input type="text" maxlength="255" size="24" name="text" />
+        <input type="submit" style="width: 100%;" value="$i18n.getString("send")" />
+    </p>
+</div>
+</form>
+
+
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findBeneficiaryForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findBeneficiaryForm.vm	2012-05-15 07:40:06 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/namebased/findBeneficiaryForm.vm	2012-09-06 18:52:44 +0000
@@ -41,6 +41,7 @@
 <div id="footer">
 <h2>$i18n.getString( "navigate_to" )</h2>
 <ul>
+	<li><a href="selectRegistrationOrganisationUnit.action">$i18n.getString( "beneficiary_registration" )</a></li>
 	<li> <a href="trackingMenu.action"> $i18n.getString("tracking_menu")</a> </li>
 	<li><a href="index.action">$i18n.getString("home")</a></li>
 </ul>

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm	2012-07-30 09:35:52 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/registration/beneficiaryRegistrationForm.vm	2012-09-06 18:52:44 +0000
@@ -22,17 +22,20 @@
 
 		<label>$i18n.getString( "gender" )</label>
 		<select name="gender">
+		
+		<option value="F"
+			#if($previousValues.get("gender") == "F")
+				selected
+			#end
+			>$i18n.getString( "female" )</option>
+			
 			<option value="M"
 			#if($previousValues.get("gender") == "M")
 				selected
 			#end
 			>$i18n.getString( "male" )</option>
 			
-			<option value="F"
-			#if($previousValues.get("gender") == "F")
-				selected
-			#end
-			>$i18n.getString( "female" )</option>
+			
 			
 			<option value="T"
 			#if($previousValues.get("gender") == "T")

=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm'
--- dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm	2012-07-19 06:43:24 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/webapp/dhis-web-light/trackingMenu.vm	2012-09-06 18:52:44 +0000
@@ -19,7 +19,7 @@
 
 <p>
 <ul>
-    <li><a href="showFindBeneficiaryForm.action">$i18n.getString( "find_beneficiary" )</a></li>
+    <li><a href="showFindBeneficiaryForm.action">$i18n.getString( "find_or_add_person" )</a></li>
     <li><a href="selectNamebasedOrganisationUnit.action">$i18n.getString( "activity_plan" )</a></li>
     <li><a href="selectRegistrationOrganisationUnit.action">$i18n.getString( "beneficiary_registration" )</a></li>
     <li><a href="anonymous.action">Anonymous</a></li>