fix for varying resolutions
Merge branch 'develop'
Valentine Zhuck added to the developers list by his and George request
Merge branch 'master' into mikitas_branch