RequestAwareness trait
point upgrades and other simple stuff
Merge branch 'upstream' into feature/merger

Conflicts:
	project/ZootBuild.scala
Merge branch 'feature/merger' into develop