Added 'Reset to defaults' option to config categories
Refactored the order of some config options for consistency
Merge branch 'master' of github.com:r41d/ingress-apk-mod

Conflicts:
	src/broot/ingress/mod/AboutModActivity.java