removing unused properties
Merge branch 'master' into develop

Conflicts:
	Hubby/Interface/Preferences/Views/General/MRGeneralPreferencesViewController.m