diff --git a/android_app/.idea/gradle.xml b/android_app/.idea/gradle.xml
new file mode 100644
index 00000000..736c7b5c
--- /dev/null
+++ b/android_app/.idea/gradle.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>
+
diff --git a/android_app/.idea/libraries/appcompat_v7_20_0_0.xml b/android_app/.idea/libraries/appcompat_v7_20_0_0.xml
new file mode 100644
index 00000000..47e8d74e
--- /dev/null
+++ b/android_app/.idea/libraries/appcompat_v7_20_0_0.xml
@@ -0,0 +1,10 @@
+<component name="libraryTable">
+  <library name="appcompat-v7-20.0.0">
+    <CLASSES>
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/20.0.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/20.0.0/classes.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/android_app/.idea/libraries/hellocharts_library_1_2.xml b/android_app/.idea/libraries/hellocharts_library_1_2.xml
new file mode 100644
index 00000000..d2fe6931
--- /dev/null
+++ b/android_app/.idea/libraries/hellocharts_library_1_2.xml
@@ -0,0 +1,9 @@
+<component name="libraryTable">
+  <library name="hellocharts-library-1.2">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/app/libs/hellocharts-library-1.2.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/android_app/.idea/libraries/support_annotations_21_0_3.xml b/android_app/.idea/libraries/support_annotations_21_0_3.xml
new file mode 100644
index 00000000..f0cb6631
--- /dev/null
+++ b/android_app/.idea/libraries/support_annotations_21_0_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="support-annotations-21.0.3">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/eclipse_android/sdk/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/eclipse_android/sdk/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/android_app/.idea/libraries/support_v4_21_0_3.xml b/android_app/.idea/libraries/support_v4_21_0_3.xml
new file mode 100644
index 00000000..4f716bfb
--- /dev/null
+++ b/android_app/.idea/libraries/support_v4_21_0_3.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="support-v4-21.0.3">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/libs/internal_impl-21.0.3.jar!/" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/classes.jar!/" />
+      <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/res" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>
\ No newline at end of file
diff --git a/android_app/android_app.iml b/android_app/android_app.iml
new file mode 100644
index 00000000..2a022014
--- /dev/null
+++ b/android_app/android_app.iml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/android_app/app/app.iml b/android_app/app/app.iml
index f5aa27d0..35e0a6d3 100644
--- a/android_app/app/app.iml
+++ b/android_app/app/app.iml
@@ -17,7 +17,6 @@
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
@@ -79,7 +78,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />