Merge pull request #141 from adriaanm/release-2.10.4-RC2

Scala 2.10.4-RC1
Merge pull request #142 from adriaanm/release-2.10.4-RC2

url encode url
Merge pull request #143 from adriaanm/release-2.10.4-RC2

Show RC on scala-lang.org/download
Merge pull request #144 from adriaanm/release-2.10.4-RC2

Revert "Show RC on scala-lang.org/download"
Fixes build, updated RC should now be live
Putting 2.11-M7 back in download/index.html
Updated Scala Logo for winter holidays
Merge pull request #145 from VladUreche/topic/christmas

Scala doodle for winter holidays
fix typo in what-is-scala page
Merge pull request #146 from nimamehanian/fix-typo-on-whatIsScala-page

fix typo in what-is-scala page
Update hacker-guide.md

Added two more Git learning resources
Merge pull request #147 from AndreVanDelft/patch-1

Update hacker-guide.md
Revert "Updated Scala Logo for winter holidays", Christmas is over :/

This reverts commit 5417acaa34e28e5ec0ed39d94c511018c1b363bf.
Fixed URL to Scala IDE update-site in 2.10.4-RC1 announcement
Merge pull request #148 from dotta/issue/fix-url-for-eclipse-update-site

Fixed URL to Scala IDE update-site in 2.10.4-RC1 announcement
Added some new events to the scala-lang feed
Merge pull request #149 from scala/more-events

Added some new events to the scala-lang feed
Events (react'14 & scalax)

react web site is still under construction but will be
http://reactconf.com/ will send an update when its finished
Merge pull request #150 from andy1138/events

Events (react'14 & scalax)
add NE Scala 2014 to events