commit
tabs done
c
Merge branch 'tabs'

Conflicts:
	Wpf.suo
merge done