Merge pull request #1 from wpbacon/Develop

Merge branch 'master' into Develop
Merge branch 'Develop'
Changed border class
Merge branch 'Develop'
Merge branch 'Develop'
Made temporary vars more unique
Merge branch 'master' into Develop