Just some quick changes to the Team and Editor page
Merged master fixed conflict
Unfinished changes to editor
Merged template branch fixed conflict.
Merged visualupdates branch fixed conflict
Unfinished mods to dashboard and blog