fixed previous accidental merge with the 1.2.x branch :) - master now updates the snapshot website
fixed previous accidental merge with the 1.2.x branch :) - master now updates the snapshot website

janurag/scalate,maslovalex/scalate,maslovalex/scalate,janurag/scalate,scalate/scalate,janurag/scalate,maslovalex/scalate,janurag/scalate,maslovalex/scalate,scalate/scalate,scalate/scalate,maslovalex/scalate,janurag/scalate,scalate/scalate