All sprint 2 resources

So I have rebased to current upstream HEAD, made some final touches that were mention in previous request (coding style, enum Strings).

I did not rewrite my history, but if you'll insist I can do it...