diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f14ae53f2..8fef40743 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -4,7 +4,7 @@ Please Add Screenshots If any UI changes.
 
 Please make sure these boxes are checked before submitting your pull request - thanks!
 
-- [ ] Apply the `MifosStyle.xml` style template to your code in Android Studio.
+- [ ] Apply the `AndroidStyle.xml` style template to your code in Android Studio.
 
 - [ ] Run the unit tests with `./gradlew check` to make sure you didn't break anything
 
diff --git a/.travis.yml b/.travis.yml
index f5ce55294..41e03a9f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,8 +10,16 @@ android:
     - extra-google-m2repository
     - build-tools-24.0.2
     - android-25
+    - android-22
+    - sys-img-armeabi-v7a-android-22
 
-script: "./gradlew build --stacktrace"
+before_script:
+  - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
+  - emulator -avd test -no-skin -no-audio -no-window &
+  - android-wait-for-emulator
+  - adb shell input keyevent 82 &
+
+script: "./gradlew build connectedAndroidTest --stacktrace"
 
 # gitter integration
 notifications:
diff --git a/AndroidStyle.xml b/AndroidStyle.xml
new file mode 100644
index 000000000..c612e654d
--- /dev/null
+++ b/AndroidStyle.xml
@@ -0,0 +1,328 @@
+<code_scheme name="AndroidStyle">
+    <option name="JAVA_INDENT_OPTIONS">
+        <value>
+            <option name="INDENT_SIZE" value="4"/>
+            <option name="CONTINUATION_INDENT_SIZE" value="8"/>
+            <option name="TAB_SIZE" value="8"/>
+            <option name="USE_TAB_CHARACTER" value="false"/>
+            <option name="SMART_TABS" value="false"/>
+            <option name="LABEL_INDENT_SIZE" value="0"/>
+            <option name="LABEL_INDENT_ABSOLUTE" value="false"/>
+            <option name="USE_RELATIVE_INDENTS" value="false"/>
+        </value>
+    </option>
+    <option name="FIELD_NAME_PREFIX" value="m"/>
+    <option name="STATIC_FIELD_NAME_PREFIX" value="s"/>
+    <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999"/>
+    <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999"/>
+    <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+            <package name="android" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="com.android" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="dalvik" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="libcore" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="com" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="gov" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="junit" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="net" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="org" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="java" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="javax" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="" static="true" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="android" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="com.android" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="dalvik" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="libcore" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="com" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="gov" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="junit" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="net" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="org" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="java" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="javax" static="false" withSubpackages="true"/>
+            <emptyLine/>
+            <package name="" static="false" withSubpackages="true"/>
+        </value>
+    </option>
+    <option name="RIGHT_MARGIN" value="100"/>
+    <option name="JD_P_AT_EMPTY_LINES" value="false"/>
+    <option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true"/>
+    <option name="JD_KEEP_EMPTY_PARAMETER" value="false"/>
+    <option name="JD_KEEP_EMPTY_EXCEPTION" value="false"/>
+    <option name="JD_KEEP_EMPTY_RETURN" value="false"/>
+    <option name="JD_PRESERVE_LINE_FEEDS" value="true"/>
+    <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
+    <option name="KEEP_BLANK_LINES_IN_CODE" value="1"/>
+    <option name="BLANK_LINES_AROUND_FIELD" value="1"/>
+    <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1"/>
+    <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
+    <option name="ALIGN_MULTILINE_FOR" value="false"/>
+    <option name="CALL_PARAMETERS_WRAP" value="1"/>
+    <option name="METHOD_PARAMETERS_WRAP" value="1"/>
+    <option name="EXTENDS_LIST_WRAP" value="1"/>
+    <option name="THROWS_LIST_WRAP" value="1"/>
+    <option name="EXTENDS_KEYWORD_WRAP" value="1"/>
+    <option name="THROWS_KEYWORD_WRAP" value="1"/>
+    <option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
+    <option name="BINARY_OPERATION_WRAP" value="1"/>
+    <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
+    <option name="TERNARY_OPERATION_WRAP" value="1"/>
+    <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true"/>
+    <option name="FOR_STATEMENT_WRAP" value="1"/>
+    <option name="ARRAY_INITIALIZER_WRAP" value="1"/>
+    <option name="ASSIGNMENT_WRAP" value="1"/>
+    <option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true"/>
+    <option name="WRAP_COMMENTS" value="true"/>
+    <option name="IF_BRACE_FORCE" value="3"/>
+    <option name="DOWHILE_BRACE_FORCE" value="3"/>
+    <option name="WHILE_BRACE_FORCE" value="3"/>
+    <option name="FOR_BRACE_FORCE" value="3"/>
+    <XML>
+        <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true"/>
+    </XML>
+    <ADDITIONAL_INDENT_OPTIONS fileType="java">
+        <option name="TAB_SIZE" value="8"/>
+    </ADDITIONAL_INDENT_OPTIONS>
+    <ADDITIONAL_INDENT_OPTIONS fileType="js">
+        <option name="CONTINUATION_INDENT_SIZE" value="4"/>
+    </ADDITIONAL_INDENT_OPTIONS>
+    <codeStyleSettings language="JAVA">
+        <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
+        <option name="ALIGN_MULTILINE_FOR" value="false"/>
+        <option name="CALL_PARAMETERS_WRAP" value="1"/>
+        <option name="PREFER_PARAMETERS_WRAP" value="true"/>
+        <option name="METHOD_PARAMETERS_WRAP" value="1"/>
+        <option name="RESOURCE_LIST_WRAP" value="1"/>
+        <option name="EXTENDS_LIST_WRAP" value="1"/>
+        <option name="THROWS_LIST_WRAP" value="1"/>
+        <option name="THROWS_KEYWORD_WRAP" value="1"/>
+        <option name="BINARY_OPERATION_WRAP" value="1"/>
+        <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
+        <option name="TERNARY_OPERATION_WRAP" value="1"/>
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true"/>
+        <option name="FOR_STATEMENT_WRAP" value="1"/>
+        <option name="ARRAY_INITIALIZER_WRAP" value="1"/>
+        <option name="ASSIGNMENT_WRAP" value="1"/>
+        <option name="IF_BRACE_FORCE" value="1"/>
+        <option name="DOWHILE_BRACE_FORCE" value="1"/>
+        <option name="WHILE_BRACE_FORCE" value="1"/>
+        <option name="FOR_BRACE_FORCE" value="1"/>
+        <option name="WRAP_LONG_LINES" value="true"/>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+        <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
+        <option name="KEEP_BLANK_LINES_IN_CODE" value="1"/>
+        <option name="BLANK_LINES_AROUND_FIELD" value="1"/>
+        <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1"/>
+        <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
+        <option name="ALIGN_MULTILINE_FOR" value="false"/>
+        <option name="CALL_PARAMETERS_WRAP" value="1"/>
+        <option name="METHOD_PARAMETERS_WRAP" value="1"/>
+        <option name="EXTENDS_LIST_WRAP" value="1"/>
+        <option name="THROWS_LIST_WRAP" value="1"/>
+        <option name="EXTENDS_KEYWORD_WRAP" value="1"/>
+        <option name="THROWS_KEYWORD_WRAP" value="1"/>
+        <option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
+        <option name="BINARY_OPERATION_WRAP" value="1"/>
+        <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
+        <option name="TERNARY_OPERATION_WRAP" value="1"/>
+        <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true"/>
+        <option name="FOR_STATEMENT_WRAP" value="1"/>
+        <option name="ARRAY_INITIALIZER_WRAP" value="1"/>
+        <option name="ASSIGNMENT_WRAP" value="1"/>
+        <option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true"/>
+        <option name="WRAP_COMMENTS" value="true"/>
+        <option name="IF_BRACE_FORCE" value="3"/>
+        <option name="DOWHILE_BRACE_FORCE" value="3"/>
+        <option name="WHILE_BRACE_FORCE" value="3"/>
+        <option name="FOR_BRACE_FORCE" value="3"/>
+        <option name="PARENT_SETTINGS_INSTALLED" value="true"/>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+        <option name="FORCE_REARRANGE_MODE" value="1"/>
+        <indentOptions>
+            <option name="CONTINUATION_INDENT_SIZE" value="4"/>
+        </indentOptions>
+        <arrangement>
+            <rules>
+                <section>
+                    <rule>
+                        <match>
+                            <AND>
+                                <NAME>xmlns:android</NAME>
+                                <XML_NAMESPACE>^$</XML_NAMESPACE>
+                            </AND>
+                        </match>
+                    </rule>
+                </section>
+                <section>
+                    <rule>
+                        <match>
+                            <AND>
+                                <NAME>xmlns:.*</NAME>
+                                <XML_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>
+</code_scheme>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index d33ccadce..dd4f2b8fb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -101,4 +101,19 @@ dependencies {
     // Unit tests dependencies
     testCompile "junit:junit:$rootProject.jUnitVersion"
     testCompile "org.mockito:mockito-core:$rootProject.mockitoVersion"
+
+    androidTestCompile "junit:junit:$rootProject.jUnitVersion"
+    androidTestCompile "org.mockito:mockito-core:$rootProject.mockitoVersion"
+    androidTestCompile "org.mockito:mockito-android:$rootProject.mockitoVersion"
+    androidTestCompile "com.android.support:support-annotations:$rootProject.supportLibraryVersion"
+    androidTestCompile("com.android.support.test.espresso:espresso-contrib:$rootProject.espressoVersion") {
+        exclude group: 'com.android.support', module: 'appcompat'
+        exclude group: 'com.android.support', module: 'support-v4'
+        exclude group: 'com.android.support', module: 'recyclerview-v7'
+        exclude group: 'com.android.support', module: 'design'
+        exclude group: 'com.android.support', module: 'support-annotations'
+    }
+    androidTestCompile "com.android.support.test.espresso:espresso-core:$rootProject.espressoVersion"
+    androidTestCompile "com.android.support.test:runner:$rootProject.runnerVersion"
+    androidTestCompile "com.android.support.test:rules:$rootProject.rulesVersion"
 }
diff --git a/build.gradle b/build.gradle
index aa425b8ae..5b8a069e3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,4 +42,7 @@ ext {
 
     jUnitVersion = '4.12'
     mockitoVersion = '2.6.2'
+    runnerVersion = '0.5'
+    rulesVersion = '0.5'
+    espressoVersion = '2.2.2'
 }