Add Koen's audio files
Regenerate audio sprites
Add branch data to measurements
More robust post-measurements.php
Fix small error in after in combination with n.Audio.load
Merge branch 'master' into koen
Update cache manifest format & configuration parsing to be compatible with newer versions of PHP
Merge branch 'koen' into ipad-children for the better audio files
Remove instructions
Remove instructions from audio sprites; replace magic sound with a neutral *plof* noise
Allow the entry of non-numbers in the age field
Switch instruction sentence in the first act. Regenerated all the audio sprites.
Merge branch 'ipad-children' of github.com:jelmervdl/childrens-game into android

Conflicts:
	assets/audio/sprites/Makefile
	assets/audio/sprites/character_introduction.json
	assets/audio/sprites/character_introduction.m4a
	assets/audio/sprites/character_introduction.ogg
	assets/audio/sprites/direct_and_indirect_speech_items.json
	assets/audio/sprites/direct_and_indirect_speech_items.m4a
	assets/audio/sprites/direct_and_indirect_speech_items.ogg
	assets/audio/sprites/no_report_items.json
	assets/audio/sprites/no_report_items.m4a
	assets/audio/sprites/no_report_items.ogg
	assets/audio/sprites/object_introduction.m4a
	assets/audio/sprites/object_introduction.ogg
	assets/audio/sprites/practise_items.json
	assets/audio/sprites/practise_items.m4a
	assets/audio/sprites/practise_items.ogg
	assets/audio/sprites/thank_you.m4a
	assets/audio/sprites/thank_you.ogg
	cache-manifest.php
	configuration.php
	etc/structure.sql
	export.php
	post-measurements.php
Post to the correct branch
Add extra buttons for the waiting for instructions; fix bug where clicking a button would trigger the callback twice.