Do not update trail inside an agent if the newTrails are Nil
(Hang onto the old trail, request may have timed out and fallen back to Nil)
Refactor contentApiQuery so that it performs one query instead of two
Remove filter on nonEmpty Seq as it is not needed
This commit changes parseResponse to the following behaviour:
 - None if all of the requests have failed
 - Some(TrailblockDescription) with result of Nil if Nil is returned
 - Some(TrailblockDescription) with actual results
Do not show a collection if there is nothing in it
Merge branch 'master' into configured-description-refactor

Conflicts:
	facia/app/views/fragments/frontBody.scala.html
Merge branch 'master' into configured-description-refactor

Conflicts:
	common/app/model/trails.scala
Fix code that got lost in the merge from master
Merge branch 'configured-description-refactor'