diff --git a/android-app-core/pom.xml b/android-app-core/pom.xml
index a0ce2f30..802148eb 100644
--- a/android-app-core/pom.xml
+++ b/android-app-core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.5.4-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.solovyev.android</groupId>
     <artifactId>calculatorpp-android-app-core</artifactId>
-    <version>1.5.4-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 	<name>Calculator++ Application Core</name>
 	<packaging>apklib</packaging>
 
diff --git a/android-app-onscreen/pom.xml b/android-app-onscreen/pom.xml
index f174239d..31d20cac 100644
--- a/android-app-onscreen/pom.xml
+++ b/android-app-onscreen/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.5.4-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.solovyev.android</groupId>
     <artifactId>calculatorpp-android-app-onscreen</artifactId>
-    <version>1.5.4-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <name>Calculator++ Application Onscreen</name>
     <packaging>apklib</packaging>
 
diff --git a/android-app-test/pom.xml b/android-app-test/pom.xml
index 8aa358df..742c2eb2 100644
--- a/android-app-test/pom.xml
+++ b/android-app-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.5.4-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/android-app-widget/pom.xml b/android-app-widget/pom.xml
index a37081cf..3c6739c3 100644
--- a/android-app-widget/pom.xml
+++ b/android-app-widget/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.5.4-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.solovyev.android</groupId>
     <artifactId>calculatorpp-android-app-widget</artifactId>
-    <version>1.5.4-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
 	<name>Calculator++ Application Widget</name>
 	<packaging>apklib</packaging>
 
diff --git a/android-app/AndroidManifest.xml b/android-app/AndroidManifest.xml
index 3a6e16d9..a6c4bc7b 100644
--- a/android-app/AndroidManifest.xml
+++ b/android-app/AndroidManifest.xml
@@ -5,7 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="com.android.vending.BILLING"/>
-	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
     <!--TODO: REMOVE IN PRODUCTION-->
     <!--<uses-permission android:name="android.permission.DISABLE_KEYGUARD"/>-->
@@ -22,7 +22,7 @@
 
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
 
-    <application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
+    <application android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/cpp_metro_blue_theme">
 
         <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
 
@@ -53,11 +53,11 @@
         <activity android:label="@string/c_vars_and_constants" android:name=".math.edit.CalculatorVarsActivity"/>
 
         <activity android:label="@string/c_plot_graph" android:name=".plot.CalculatorPlotActivity"/>
-        <activity android:launchMode="singleTop" android:label="@string/cpp_plot_functions" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
-        <activity android:launchMode="singleTop" android:label="@string/cpp_plot_function_settings" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
-        <activity android:launchMode="singleTop" android:label="@string/cpp_plot_range" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+        <activity android:label="@string/cpp_plot_functions" android:launchMode="singleTop" android:name=".plot.CalculatorPlotFunctionsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+        <activity android:label="@string/cpp_plot_function_settings" android:launchMode="singleTop" android:name=".plot.CalculatorPlotFunctionSettingsActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+        <activity android:label="@string/cpp_plot_range" android:launchMode="singleTop" android:name=".plot.CalculatorPlotRangeActivity" android:theme="@style/cpp_gray_dialog_theme"/>
 
-        <activity android:launchMode="singleTop" android:label="@string/cpp_purchase_title" android:name=".preferences.CalculatorPurchaseDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
+        <activity android:label="@string/cpp_purchase_title" android:launchMode="singleTop" android:name=".preferences.CalculatorPurchaseDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
 
         <activity android:launchMode="singleTop" android:name=".CalculatorDialogActivity" android:theme="@style/cpp_gray_dialog_theme"/>
 
diff --git a/android-app/pom.xml b/android-app/pom.xml
index c1b41ec5..206c2a5d 100644
--- a/android-app/pom.xml
+++ b/android-app/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.5.4-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/core/pom.xml b/core/pom.xml
index c24e4357..3e60e059 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.solovyev.android</groupId>
         <artifactId>calculatorpp-parent</artifactId>
-        <version>1.5.4-SNAPSHOT</version>
+        <version>1.6.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.solovyev.android</groupId>
     <artifactId>calculatorpp-core</artifactId>
-    <version>1.5.4-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <name>Calculator++ Core</name>
 
     <packaging>jar</packaging>
diff --git a/pom.xml b/pom.xml
index df8c9e08..17fc78ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <groupId>org.solovyev.android</groupId>
     <artifactId>calculatorpp-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.5.4-SNAPSHOT</version>
+    <version>1.6.0-SNAPSHOT</version>
     <name>Calculator++</name>
 
     <scm>
@@ -43,27 +43,27 @@
 			<dependency>
 				<groupId>org.solovyev.android</groupId>
 				<artifactId>calculatorpp-core</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>1.6.0-SNAPSHOT</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.solovyev.android</groupId>
 				<artifactId>calculatorpp-android-app-core</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>1.6.0-SNAPSHOT</version>
 				<type>apklib</type>
 			</dependency>
 
 			<dependency>
 				<groupId>org.solovyev.android</groupId>
 				<artifactId>calculatorpp-android-app-widget</artifactId>
-				<version>1.5.4-SNAPSHOT</version>
+				<version>1.6.0-SNAPSHOT</version>
 				<type>apklib</type>
 			</dependency>
 
             <dependency>
                 <groupId>org.solovyev.android</groupId>
                 <artifactId>calculatorpp-android-app-onscreen</artifactId>
-                <version>1.5.4-SNAPSHOT</version>
+                <version>1.6.0-SNAPSHOT</version>
                 <type>apklib</type>
             </dependency>