changed troop/user association for newsletters. fixed new troop form
merge conflicts