Text tweaks
Merge branch 'master' of https://github.com/JohnUiterwyk/CFADemo

Conflicts:
	CFADemoServer/war/WEB-INF/appengine-web.xml
Conflict resolved