Correct the name of the final parameter.
Clean up whitespace, add comments for future work.
Add a tools:layout entry for Android Studio's UI builder view.
Merge branch 'actionbar' into custom-album-view