Merge branch 'develop'

Author: codinguser

.gitignore

@@ -12,4 +12,6 @@ gen-external-apklibs
 *.ipr
 .idea/
 *.iws
-out/
+out/
+*.project
+*.classpath

CHANGELOG.md

@@ -1,5 +1,17 @@
 Change Log
 ===============================================================================
+Version 1.3.1 *(2014-02-14)*
+----------------------------
+* Fixed: Crash when bulk moving transactions
+* Fixed: Missing string for internationalization in ru_RU locale
+* Fixed: Random crashes when opening ScheduledTransactions list
+* Fixed: Blank screen after closing AccountFormFragment
+* Fixed: Correct normal balance of the different types of ASSET accounts
+* Fixed: Limit the target accounts for bulk transfers to same currency and non-placeholder accounts
+* Improved: Remember last opened tab in accounts list
+* Improved: Added version information for feedback email
+* Improved: Lists of accounts are now sorted by the fully qualified account name
+
 Version 1.3.0 *(2014-02-10)*
 ----------------------------
 * Fixed: Some file managers do not display all files available for import

app/AndroidManifest.xml

@@ -17,8 +17,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.gnucash.android"
-    android:versionCode="25"
-    android:versionName="1.3.0" >
+    android:versionCode="26"
+    android:versionName="@string/app_version_name" >
 
     <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="15"/>
 
@@ -48,15 +48,15 @@
         android:label="@string/app_name" 
         android:theme="@style/Theme.Sherlock.Light.DarkActionBar">
         <activity
-            android:name=".ui.accounts.AccountsActivity"
+            android:name=".ui.account.AccountsActivity"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <activity android:name=".ui.settings.SettingsActivity"/>
-        <activity android:name=".ui.transactions.TransactionsActivity" 
+        <activity android:name=".ui.transaction.TransactionsActivity"
             android:configChanges="orientation|screenSize">
         </activity>
         <activity android:name=".ui.widget.WidgetConfigurationActivity"

app/res/drawable-hdpi/content_event_holo_dark.png

@@ -15,7 +15,7 @@
  limitations under the License.
 -->
 
-<org.gnucash.android.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<org.gnucash.android.ui.util.CheckableLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:layout_width="match_parent"
               android:layout_height="?android:attr/listPreferredItemHeight"
               android:gravity="center_vertical"
@@ -62,4 +62,4 @@
             android:focusable="false"
             android:contentDescription="@string/description_add_transaction_icon"/>
 
-</org.gnucash.android.util.CheckableLinearLayout>
+</org.gnucash.android.ui.util.CheckableLinearLayout>