From ee2d2c9608e85d47d7dcd59867de25b47fcd934f Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Mon, 19 Jan 2015 19:56:54 +0100
Subject: [PATCH] IDEA changes

---
 .idea/codeStyleSettings.xml               | 269 ++++++++++++----------
 .idea/runConfigurations/Acra_Analyzer.xml |   1 +
 android-app-core.iml                      |  35 +--
 android-app-onscreen.iml                  |  21 +-
 android-app-widget.iml                    |  21 +-
 android-app.iml                           |  51 ++--
 6 files changed, 216 insertions(+), 182 deletions(-)

diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index c6e27fbd..9febb239 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -37,125 +37,153 @@
           </indentOptions>
           <arrangement>
             <rules>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>xmlns:android</NAME>
-                    <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
-                  </AND>
-                </match>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>xmlns:.*</NAME>
-                    <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
-                  </AND>
-                </match>
-                <order>BY_NAME</order>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*:id</NAME>
-                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                  </AND>
-                </match>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*:name</NAME>
-                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                  </AND>
-                </match>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>name</NAME>
-                    <XML_NAMESPACE>^$</XML_NAMESPACE>
-                  </AND>
-                </match>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>style</NAME>
-                    <XML_NAMESPACE>^$</XML_NAMESPACE>
-                  </AND>
-                </match>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*</NAME>
-                    <XML_NAMESPACE>^$</XML_NAMESPACE>
-                  </AND>
-                </match>
-                <order>BY_NAME</order>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*:layout_width</NAME>
-                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                  </AND>
-                </match>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*:layout_height</NAME>
-                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                  </AND>
-                </match>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*:layout_.*</NAME>
-                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                  </AND>
-                </match>
-                <order>BY_NAME</order>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*:width</NAME>
-                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                  </AND>
-                </match>
-                <order>BY_NAME</order>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*:height</NAME>
-                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                  </AND>
-                </match>
-                <order>BY_NAME</order>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*</NAME>
-                    <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                  </AND>
-                </match>
-                <order>BY_NAME</order>
-              </rule>
-              <rule>
-                <match>
-                  <AND>
-                    <NAME>.*</NAME>
-                    <XML_NAMESPACE>.*</XML_NAMESPACE>
-                  </AND>
-                </match>
-                <order>BY_NAME</order>
-              </rule>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:android</NAME>
+                      <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>xmlns:.*</NAME>
+                      <XML_NAMESPACE>Namespace:</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:id</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:name</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>name</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>style</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>^$</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:layout_.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:width</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*:height</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
+              <section>
+                <rule>
+                  <match>
+                    <AND>
+                      <NAME>.*</NAME>
+                      <XML_NAMESPACE>.*</XML_NAMESPACE>
+                    </AND>
+                  </match>
+                  <order>BY_NAME</order>
+                </rule>
+              </section>
             </rules>
           </arrangement>
         </codeStyleSettings>
@@ -164,5 +192,4 @@
     <option name="USE_PER_PROJECT_SETTINGS" value="true" />
     <option name="PREFERRED_PROJECT_CODE_STYLE" value="serso" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Acra_Analyzer.xml b/.idea/runConfigurations/Acra_Analyzer.xml
index d57b8557..2c2df798 100644
--- a/.idea/runConfigurations/Acra_Analyzer.xml
+++ b/.idea/runConfigurations/Acra_Analyzer.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Acra Analyzer" type="Application" factoryName="Application">
+    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <option name="MAIN_CLASS_NAME" value="org.solovyev.acraanalyzer.AcraAnalyzer" />
     <option name="VM_PARAMETERS" value="" />
     <option name="PROGRAM_PARAMETERS" value="--file=$USER_HOME$/downloads/cpp/mails.mbox --out=./acra.txt" />
diff --git a/android-app-core.iml b/android-app-core.iml
index 3f9381ca..24c6422e 100644
--- a/android-app-core.iml
+++ b/android-app-core.iml
@@ -28,12 +28,14 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-core/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/generated-sources/extracted-dependencies" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/idea-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-core/target/unpack" />
@@ -41,29 +43,28 @@
     <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
     <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
-    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: commons-codec:commons-codec:1.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.robolectric:robolectric:2.1.1" level="project" />
@@ -74,6 +75,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-tree:4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-util:4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-analysis:4.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ximpleware:vtd-xml:2.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.easytesting:fest-util:1.2.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.easytesting:fest-reflect:1.4.1" level="project" />
@@ -89,39 +91,39 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-artifact:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-artifact-manager:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-repository-metadata:2.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: backport-util-concurrent:backport-util-concurrent:3.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-model:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-project:2.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-settings:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-profile:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-plugin-registry:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-error-diagnostics:2.2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-settings:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-file:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-shared:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:xercesMinimal:1.9.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
@@ -319,5 +321,4 @@
       </map>
     </option>
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/android-app-onscreen.iml b/android-app-onscreen.iml
index 9de23d93..32c6d13c 100644
--- a/android-app-onscreen.iml
+++ b/android-app-onscreen.iml
@@ -28,12 +28,14 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-onscreen/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/generated-sources/extracted-dependencies" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/idea-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-onscreen/target/unpack" />
@@ -42,7 +44,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
@@ -52,9 +53,9 @@
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
     <orderEntry type="module" module-name="android-app-core" />
-    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
@@ -67,26 +68,27 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
@@ -284,5 +286,4 @@
       </map>
     </option>
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/android-app-widget.iml b/android-app-widget.iml
index b2a0e60c..a3f7c602 100644
--- a/android-app-widget.iml
+++ b/android-app-widget.iml
@@ -28,12 +28,14 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app-widget/src/main/java" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/generated-sources/extracted-dependencies" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/idea-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app-widget/target/unpack" />
@@ -42,7 +44,6 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
     <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
@@ -52,9 +53,9 @@
     <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
     <orderEntry type="module" module-name="android-app-core" />
-    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
     <orderEntry type="library" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
@@ -67,26 +68,27 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
@@ -284,5 +286,4 @@
       </map>
     </option>
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/android-app.iml b/android-app.iml
index 0d229d44..ce94d0d2 100644
--- a/android-app.iml
+++ b/android-app.iml
@@ -28,54 +28,57 @@
       <sourceFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/aidl" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/src/main/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/android-app/src/test/java" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/apidocs" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/classes-instrumented" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-assets" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/combined-resources" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/generated-sources/extracted-dependencies" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/gpg" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/idea-classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/idea-test-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/javadoc-bundle-options" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-archiver" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/maven-status" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/android-app/target/surefire-reports" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/test-classes" />
       <excludeFolder url="file://$MODULE_DIR$/android-app/target/unpack" />
     </content>
     <orderEntry type="jdk" jdkName="Maven Android API 17 Platform (2)" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="core" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.solovyev:common-listeners:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
-    <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
-    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
     <orderEntry type="library" name="Maven: commons-cli:commons-cli:1.2" level="project" />
     <orderEntry type="module" module-name="android-app-core" />
-    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
-    <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
-    <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
     <orderEntry type="module" module-name="android-app-widget" />
     <orderEntry type="module" module-name="android-app-onscreen" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-core:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.findbugs:annotations:2.0.1" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-text:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android.admob:admob:6.4.1-r11.0.0" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-security:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-tasks:1.0.7" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:jscl:1.0.8" level="project" />
+    <orderEntry type="library" name="Maven: org.solovyev:common-msg:1.0.5" level="project" />
     <orderEntry type="library" name="Maven: ch.acra:acra:4.3.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: commons-codec:commons-codec:1.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r7" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.sf.opencsv:opencsv:2.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:1.9.0" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.objenesis:objenesis:1.0" level="project" />
+    <orderEntry type="library" name="Maven: org.simpleframework:simple-xml:2.6.1" level="project" />
+    <orderEntry type="library" name="Maven: stax:stax:1.2.0" level="project" />
+    <orderEntry type="library" name="Maven: com.google.guava:guava:11.0.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.robolectric:robolectric:2.1.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.xerial:sqlite-jdbc:3.7.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:4.1" level="project" />
@@ -83,6 +86,7 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-tree:4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-util:4.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm-analysis:4.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ximpleware:vtd-xml:2.11" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.easytesting:fest-util:1.2.5" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.easytesting:fest-reflect:1.4.1" level="project" />
@@ -97,39 +101,39 @@
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-artifact:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-artifact-manager:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-repository-metadata:2.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: backport-util-concurrent:backport-util-concurrent:3.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-model:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-project:2.2.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-settings:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-profile:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-plugin-registry:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-error-diagnostics:2.2.1" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven:maven-settings:2.2.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-file:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-lightweight:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-http-shared:1.0-beta-6" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:xercesMinimal:1.9.6.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: nekohtml:nekohtml:1.9.6.2" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: org.apache.maven.wagon:wagon-provider-api:1.0-beta-6" level="project" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-all_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-ads_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-billing_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-core_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-db_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-http_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-lists_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-menus_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-other_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-preferences_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-sherlock_1.1.16" />
-    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-security_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-views_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-keyboards_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-app_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-networks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-fragments_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-tasks_1.1.16" />
     <orderEntry type="module" module-name="~apklib-org.solovyev.android_android-common-wizard_1.1.16" />
+    <orderEntry type="module" module-name="~apklib-com.actionbarsherlock_actionbarsherlock_4.2.0" />
   </component>
   <component name="org.twodividedbyzero.idea.findbugs">
     <option name="_basePreferences">
@@ -327,5 +331,4 @@
       </map>
     </option>
   </component>
-</module>
-
+</module>
\ No newline at end of file