Merge remote-tracking branch 'origin/jeff' into wes
Merge remote-tracking branch 'origin/tal' into wes
started laying out new index
Merge remote-tracking branch 'origin/tal' into wes

Conflicts:
	assets/libraries/indexLibrary.php