add form id to func docs #1960
add organization vocab to vsite #1939
use organization vocab to generate branding block #1939
move field to vsite.module #1939
clean up .info file
add parent site before organization in branding block #1939
fix instance export #1939
fix conflicts #1939