[Category] [Income] [Expense] classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Money-Tracker/Money-Tracker/Properties/Settings.Designer.cs
	Money-Tracker/Money-Tracker/Properties/Settings.settings
	Money-Tracker/Money-Tracker/Web.config
Merge remote-tracking branch 'origin/master'

Conflicts:
	Money-Tracker/Money-Tracker/Properties/Settings.Designer.cs
	Money-Tracker/Money-Tracker/Properties/Settings.settings
	Money-Tracker/Money-Tracker/Web.config