add cross-domain stuff for webapp
blah
add cards
merge conf