Merge pull request #7 from oren/master

2 proposals
added merrick & joe's proposal
added content for proposal
added twitter handles
Merge pull request #8 from joeeames/master

Lessons from 100k Lines of JS Proposal
update dates
update CFP deadline
切换语言时，鼠标变成手型
加上我（kennyluck）的分享提案。
连接错误，字句修饰。
错字。
Merge pull request #10 from kennyluck/master

Talk proposal from Kang-Hao (Kenny) Lu of Opera/Oupeng
Merge pull request #9 from zzxadi/patch-1

切换语言时，鼠标变成手型
add venue location to map
Update dates in README.md
Merge pull request #11 from dybskiy/patch-1

Update dates in README.md
implement grunt for static site generation based on dust templates
move body style to css file
first commit of new design
image preload