Flourish	

Rearranged some things, added CharityName instead of just ID for team
page. 

Need to start testing on main server.. I'm thinking the templates need
updated as well.