Merge pull request #1109 from kwilczynski/master

Updates to Warsaw 2014.
Update the /propose sub-page too!

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>