merge
Merge branch 'master' of https://github.com/sgattani/Group-Project
newsfeed tabs
transitioning profile into fragment
refactor tabs
tabbed hunt feeds
Merge branch 'master' of https://github.com/sgattani/Group-Project

Conflicts:
	ChaseIt/AndroidManifest.xml
	ChaseIt/project.properties
	ChaseIt/res/menu/news_feed_test.xml
	ChaseIt/res/values/strings.xml
	ChaseIt/src/com/chaseit/activities/NewsFeedTestActivity.java
parse + adapter + hunt fragments working
Merge branch 'master' of https://github.com/sgattani/Group-Project

Conflicts:
	ChaseIt/project.properties
	ChaseIt/src/com/chaseit/activities/HuntDetailsTestActivity.java
	ChaseIt/src/com/chaseit/activities/MapsTestActivity.java
	ChaseIt/src/com/chaseit/models/HuntImage.java
added navigation drawer
bug fix w icon
drawer nav with options
Commented out maps
Merge branch 'master' of https://github.com/sgattani/Group-Project into dev

Conflicts:
	ChaseIt/src/com/chaseit/activities/HuntDetailsTestActivity.java
	ChaseIt/src/com/chaseit/activities/MapsTestActivity.java
	ChaseIt/src/com/chaseit/models/HuntImage.java
Merge from bgando fork

Conflicts:
	ChaseIt/project.properties
	ChaseIt/res/values/strings.xml
	ChaseIt/src/com/chaseit/activities/CreateChaseActivity.java
	ChaseIt/src/com/chaseit/activities/MapsTestActivity.java
	ChaseIt/src/com/chaseit/activities/NewsFeedTestActivity.java
	ChaseIt/src/com/chaseit/fragments/HuntPlayFragment.java
	ChaseIt/src/com/chaseit/models/HuntImage.java
	ChaseIt/src/com/chaseit/util/FragmentFactory.java