SIGN IN SIGN UP

Merge branch '7.0.x'

# Conflicts:
#	framework-platform/framework-platform.gradle
J
Juergen Hoeller committed
9db16e4c1568f6eaa57f83362f8c0a41bf892714