Merge branch 'master' of...

Merge branch 'master' of https://dev.azure.com/atxpdev/xpoint-app/_git/xpoint-app into widget_dev_try

# Conflicts:
#	app/src/main/res/layout/activity_xpoint_app_widget_table.xml
#	app/src/main/res/layout/activity_xpoint_app_widget_table_row.xml