Merge pull request #1087 from mattcallanan/master

Updated Presentations page for Brisbane 2014.
Add new partners/sponsors: Kainos and Chef.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1088 from kwilczynski/master

Add new partners/sponsors: Kainos and Chef.
Add number of speakers bio, and update programme.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1089 from kwilczynski/master

Add number of speakers bio, and update programme.
More additions and/or fixes for the programme and proposals sections.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1090 from kwilczynski/master

More additions and/or fixes for the programme and proposals sections.
Fix. Bad merge.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1091 from kwilczynski/master

Fix. Bad merge.
Template does not like "author" to have comma in it, try to circumvent.

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

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1092 from kwilczynski/master

More fixes.
Add missing link.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1093 from kwilczynski/master

Add missing link.
Fix number of things with template rendering.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1094 from kwilczynski/master

Fix number of things with template rendering.
Fix. Try to fix the "author" thing.

Signed-off-by: Krzysztof Wilczynski <krzysztof.wilczynski@linux.com>
Merge pull request #1095 from kwilczynski/master

Fix. Try to fix the "author" thing.