branch 1
push to upstream
local commit
locao commit 3/18
rc1
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	GaeForum/src/main/java/gaeforum/Test.java