merge attempt
Merge fix
Merge branch 'issue-621' of https://github.com/anishgkanchan/MozStumbler into issue-621

Conflicts:
	res/layout/activity_about.xml