Category View Work
Merge remote-tracking branch 'origin/master'

Conflicts:
	HomeAccounting.v11.suo