ddd
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/com/expelabs/tips/activity/AdditionalSettingsActivity.java