from home
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/modules.xml
	app/.gitignore
	app/build.gradle
	app/key.jks
	app/proguard-rules.txt
	app/src/main/AndroidManifest.xml
	app/src/main/assets/banks.xml
	app/src/main/assets/nadra.png
	app/src/main/assets/privat.png
	app/src/main/java/com/vnavigator/SMSProcyon/ActivityLogin.java
	app/src/main/java/com/vnavigator/SMSProcyon/ActivityMain.java
	app/src/main/java/com/vnavigator/SMSProcyon/ActivityPrefs.java
	app/src/main/java/com/vnavigator/SMSProcyon/ActivitySMSLog.java
	app/src/main/java/com/vnavigator/SMSProcyon/Bank.java
	app/src/main/java/com/vnavigator/SMSProcyon/BanksParser.java
	app/src/main/java/com/vnavigator/SMSProcyon/CardDialog.java
	app/src/main/java/com/vnavigator/SMSProcyon/DB.java
	app/src/main/java/com/vnavigator/SMSProcyon/Money.java
	app/src/main/java/com/vnavigator/SMSProcyon/SMSData.java
	app/src/main/java/com/vnavigator/SMSProcyon/SMSMonitor.java
	app/src/main/java/com/vnavigator/SMSProcyon/SMSService.java
	app/src/main/java/com/vnavigator/SMSProcyon/WidgetSingle.java
	app/src/main/java/com/vnavigator/SMSProcyon/WidgetSingleConfigureActivity.java
	app/src/main/java/com/vnavigator/SMSProcyon/WidgetStack.java
	app/src/main/java/com/vnavigator/SMSProcyon/WidgetStackConfigureActivity.java
	app/src/main/java/com/vnavigator/SMSProcyon/WidgetStackService.java
	app/src/main/res/drawable-hdpi/app_icon.png
	app/src/main/res/drawable-hdpi/card.9.png
	app/src/main/res/drawable-hdpi/debet.png
	app/src/main/res/drawable-hdpi/info.png
	app/src/main/res/drawable-hdpi/kredit.png
	app/src/main/res/drawable-mdpi/app_icon.png
	app/src/main/res/drawable-nodpi/singlewidget_preview.png
	app/src/main/res/drawable-nodpi/stackwidget_preview.png
	app/src/main/res/drawable-nodpi/widget_background.xml
	app/src/main/res/drawable-xhdpi/app_icon.png
	app/src/main/res/drawable-xxhdpi/app_icon.png
	app/src/main/res/drawable-xxxhdpi/app_icon.png
	app/src/main/res/layout/activity_login.xml
	app/src/main/res/layout/activity_main.xml
	app/src/main/res/layout/activity_main_lv_item.xml
	app/src/main/res/layout/activity_main_lv_item_footer.xml
	app/src/main/res/layout/activity_sms.xml
	app/src/main/res/layout/activity_sms_lv_item.xml
	app/src/main/res/layout/dlg_about.xml
	app/src/main/res/layout/dlg_card.xml
	app/src/main/res/layout/dlg_card_spinner_item.xml
	app/src/main/res/layout/widget_single.xml
	app/src/main/res/layout/widget_single_configure.xml
	app/src/main/res/layout/widget_single_configure_lv_item.xml
	app/src/main/res/layout/widget_stack.xml
	app/src/main/res/layout/widget_stack_configure.xml
	app/src/main/res/layout/widget_stack_configure_lv_item.xml
	app/src/main/res/menu/lv_menu.xml
	app/src/main/res/menu/main.xml
	app/src/main/res/menu/smslog.xml
	app/src/main/res/raw-ru/license.htm
	app/src/main/res/raw-uk/license.htm
	app/src/main/res/raw/license.htm
	app/src/main/res/values-ru/arrays.xml
	app/src/main/res/values-ru/strings.xml
	app/src/main/res/values-uk/arrays.xml
	app/src/main/res/values-uk/strings.xml
	app/src/main/res/values-v14/dimens.xml
	app/src/main/res/values/arrays.xml
	app/src/main/res/values/colors.xml
	app/src/main/res/values/dimens.xml
	app/src/main/res/values/strings.xml
	app/src/main/res/values/styles.xml
	app/src/main/res/xml/pref.xml
	app/src/main/res/xml/single_widget_info.xml
	app/src/main/res/xml/stack_widget_info.xml
	build.gradle
from home