Merge branch 'android-2.1' of C:\Users\Constantine\Development\makados_org with conflicts.
WT-94 - Removed ProgressDialogs from word activities