0.7.1-tomondev
merge from upstream 0.8-SNAPSHOT
ZOOMDEV-1919: upgrade to play 2.2.1