Merge branch 'hotfix/v2013.11.24.02' into develop
Merge branch 'hotfix/v2013.11.24.03' into develop
fix-issue-10, same city multiple times in the combobox
Merge branch 'develop'