renamed variables
fixed conflicts.
Merge branch 'master' into swingStuff