Merge branch 'jen'
Merge branch 'david'
Working changes to things Jen was working on before David interrupted.
Merge branch 'jen'
Merge branch 'david'
Merge branch 'david'
Merge branch 'david'

Conflicts:
	apps/basicNetwork/index.php