milestone1
Update #72

Bibliography interface prototype 1
Update #73

New GUI
Update #74
Update #75
Update #76
11
Update #77
Merge branch 'Bibliography'

Conflicts:
	oa2_v0_main/DataFolder/data.waData
	oa2_v0_main/DataFolder/data.WakTDef
	oa2_v0_main/Model.js
	oa2_v0_main/Model.waModel
Merge branch 'Media'

Conflicts:
	oa2_v0_main/DataFolder/data.WakTDef
	oa2_v0_main/DataFolder/data.waData
	oa2_v0_main/Model.js
	oa2_v0_main/Model.waModel