good!
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/ActionsContentViewExample.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/sample/actionscontentview/ExamplesActivity$SettingsChangedListener.class
	bin/classes/sample/actionscontentview/ExamplesActivity.class
	bin/classes/sample/actionscontentview/LauncherActivity.class
	bin/classes/sample/actionscontentview/LoginActivity.class
	bin/classes/sample/actionscontentview/R$id.class
	bin/classes/sample/actionscontentview/fragment/NotificationFragment$1.class
	bin/classes/sample/actionscontentview/fragment/NotificationFragment.class
	bin/classes/sample/actionscontentview/fragment/PaymentHistoryFragment$1.class
	bin/classes/sample/actionscontentview/fragment/PaymentHistoryFragment.class
	bin/classes/sample/actionscontentview/fragment/PaymentStatementFragment.class
	bin/classes/sample/actionscontentview/fragment/RecordWeeklyTabFragment.class
	bin/classes/sample/actionscontentview/fragment/SampleChartFragment.class
	bin/classes/sample/actionscontentview/fragment/SampleIonFragment$1.class
	bin/classes/sample/actionscontentview/fragment/SampleIonFragment.class
	bin/classes/sample/actionscontentview/fragment/SampleTableFragment.class
	bin/classes/sample/actionscontentview/fragment/SandboxFragment$1.class
	bin/classes/sample/actionscontentview/fragment/SandboxFragment.class
	bin/classes/sample/actionscontentview/fragment/WebViewFragment.class
	bin/resources.ap_
	gen/sample/actionscontentview/R.java
	res/layout/recordweekly_tab_item.xml
	src/sample/actionscontentview/LauncherActivity.java
	src/sample/actionscontentview/LoginActivity.java
	src/sample/actionscontentview/fragment/RecordWeeklyTabFragment.java