Combined the map and listview fragments to one layout. It's accessible
by choosing "Settings" in the nav drawer. We need to add a custom
adapter for our posts/discussions, it's set to the NavArrayListAdapater
now just so you can see the listview on top of the map.
Merge branch 'master' of https://github.com/BrennaBlackwell/spARK.git

Conflicts:
	spARK/AndroidManifest.xml
	spARK/src/edu/uark/spARK/MainActivity.java

Added combined layout for newsfeed and map fragments. It's currently
accessed under "Settings". It's set to our NavArrayAdapter which is why
it shows up the nav items (just so you can see the listfragment on top
of the map), but we will have to make another one for the
discussions/bulletins.