Merge remote-tracking branch 'upstream/master'
Updated Spanish translation file.

git-svn-id: http://corsix-th.googlecode.com/svn/trunk@1918 c39591fa-788f-11de-a72b-d90af8dea425
Fix (r1863): Crash when building or removing a research room while a patient with fulfilled disease requirements was waiting for a decision. Fixes issue 1476.

git-svn-id: http://corsix-th.googlecode.com/svn/trunk@1919 c39591fa-788f-11de-a72b-d90af8dea425
A small fix from Mark regarding VIP fax messages.

git-svn-id: http://corsix-th.googlecode.com/svn/trunk@1920 c39591fa-788f-11de-a72b-d90af8dea425
Merge remote-tracking branch 'upstream/master'
Temporary fix for resolution changes
Merge branch 'master' of https://github.com/TheCycoONE/corsix-th