Merge pull request #142 from devinlynch/devin-april7-2

Devin april7 2
changes for recruit things
Merge pull request #143 from devinlynch/John-April7-15

changes for recruit things
Just all kinds of changes
added support for demo mode
Merge pull request #144 from devinlynch/John-April7-15

John april7 15
Added isDemo support
Merge pull request #145 from devinlynch/devin-april9th

Added isDemo support
Merge branch 'master' into devin-april7-2
Merge from mast