CreditCard, MenuHelper
Merge remote-tracking branch 'origin/master'

Conflicts:
	sample_app/.idea/workspace.xml