Merge branch 'hotfix/2.1.5'
2.1.6   (20131223) Hotfix to handle addresses with alternative apartment number format. Incremented module version numbers, as shown in admin.
Merge branch 'hotfix/2.1.6' into develop