Fix sub-menus for non-Unicon sites.
fix displaying of country of residence in 'country' when no country-representing is specified. Also adjust the printing of the events forms, pushing the options to the right side
Merge remote-tracking branch 'scott/master'