Further cleanup of using directives
Merge remote-tracking branch 'zahndy/master'

Conflicts:
	o3o/DMElement.xaml.cs
Fix things lost in merge. :(
Merge pull request #15 from LightDrake/master

Stuff stuffs. o.o