Added tree images and initial data source for trees
Merge branch 'master' of https://github.com/btelintelo/campjoy

Conflicts:
	ios/Camp Joy Outdoors.xcworkspace/xcshareddata/Camp Joy Outdoors.xccheckout
	ios/Camp Joy Outdoors/CJOAppDelegate.m
Added images to tree view controller
Got rid of hard code test for treeID
Merge remote-tracking branch 'origin/master'
Sam’s fixes for auto layout on the home screen
Merge branch 'master' of https://github.com/btelintelo/campjoy