Another very subpar week - sorry, folks. Got stuck in the LodgingList,
where plenty of errors still exist, so all Event-related and Splash
screen work still needs to be done.
Merge branch 'Lodging,Event,Splash'

Conflicts:
	res/values/strings.xml
	src/edu/miracosta/cs134/tripplanner/MainActivity.java
cleanup after J