Merge pull request #42 from Xracer/master

updating
Up to date

Code is up to date with basecode, but many changes were removed. Will
need to redo it.
Combining multiple states, error when trying to access SoldierInfoState passing parameters incorrectly.
trying to correct issues

attempting to get the soldiers diary into soldierinfostate.cpp
getting there little by little, the code for the soldier windows is now present, but not compiling
moving along
Sodier diary is now compiling but data is not being passed, Side error OK button is not working
Merge branch 'master' into WIP
Merge pull request #43 from Xracer/WIP

Wip