SQLContext extended, HtmlHelper in.
Merge commit '0b54e83923a72d6692dec4542cc66135a8f2e6c1'