neon-sprint-4
clean up the trunk (we'll commit a fresh one next)
remove branches since they are not used at all
test sf svn
cleanup
copy sprint 3 to trunk, step 2
copy sprint 3 to trunk