Added "you've" to the total toast
Added change dialog popup
Merge branch 'master' into widget

Conflicts:
	app/AndroidManifest.xml