diff --git a/.gitmodules b/.gitmodules
index e5bdd59..bb82339 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "submodules/PhotoView"]
 	path = submodules/PhotoView
 	url = https://github.com/chrisbanes/PhotoView.git
+[submodule "submodules/StickyGridHeaders"]
+	path = submodules/StickyGridHeaders
+	url = https://github.com/httpdispatch/StickyGridHeaders.git
diff --git a/submodules/Android-Feather/.classpath b/submodules/Android-Feather/.classpath
index 23a6ea6..26bdfa6 100644
--- a/submodules/Android-Feather/.classpath
+++ b/submodules/Android-Feather/.classpath
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="lib" path="libs/android-feather-library.jar" sourcepath="/Android-Feather-Library"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/submodules/google-play-services_lib/.classpath b/submodules/google-play-services_lib/.classpath
index a662f00..c3c8602 100644
--- a/submodules/google-play-services_lib/.classpath
+++ b/submodules/google-play-services_lib/.classpath
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/submodules/google-play-services_lib/.gitignore b/submodules/google-play-services_lib/.gitignore
new file mode 100644
index 0000000..5e56e04
--- /dev/null
+++ b/submodules/google-play-services_lib/.gitignore
@@ -0,0 +1 @@
+/bin
diff --git a/test/.classpath b/test/.classpath
index faac7ba..92e2104 100644
--- a/test/.classpath
+++ b/test/.classpath
@@ -16,5 +16,6 @@
 	<classpathentry exported="true" kind="lib" path="libs/testng-6.8.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>