Merge remote-tracking branch 'origin/master'

# Conflicts:
#	generallibrary/src/main/res/layout/activity_new_card_1_ge.xml