Merged in Rebecca's DB example. Was unable to test to see if/how it worked.

Also fixed the tabbing/spacing in MainActivity.java
Merge branch 'develop'