Merge remote-tracking branch 'origin/tal' into wes
added functionality to cycle through members when viewing a member
factored a bunch of things into single functions by adding parameters
fixed possible future buggs, optimizing code with terniary operators
Merge remote-tracking branch 'origin/wes' into tal