New modal windows progress through editUnits and editBuidling
Merge branch 'master' of github.com:NinjaBranDizzle/demo