Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Merge branch 'master' of https://github.com/coloratur/brasil2014.git

Conflicts:
	Brasil2014/index.html
	Brasil2014/scripts/app.js
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Merge branch 'master' of https://github.com/coloratur/brasil2014.git
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Changes made by Niels Schuhmacher (niels.schuhmacher@bitbase.de).
Merge branch 'master' of https://github.com/coloratur/brasil2014.git