celanup
cleanup
cleanup
Fixed conflict etc.

Edited the "using" directives etc.
Merge branch 'ctrucza-master'