Changes made by Andre Schneider (andre.schneider@coloratur.com).
Changes made by Andre Schneider (andre.schneider@coloratur.com).
Changes made by Andre Schneider (andre.schneider@coloratur.com).
Changes made by Andre Schneider (andre.schneider@coloratur.com).
Merge branch 'master' of https://github.com/coloratur/brasil2014.git
Merge branch 'master' of https://github.com/coloratur/brasil2014.git

Conflicts:
	Brasil2014/index.html
	Brasil2014/scripts/app.js
	Brasil2014/styles/images/Teams/nl.svg
Changes made by Andre Schneider (andre.schneider@coloratur.com).
Changes made by Andre Schneider (andre.schneider@coloratur.com).
Changes made by Andre Schneider (andre.schneider@coloratur.com).