Updated font color
Merge branch 'developmental'
Revision of new aSDI session

Remade files for new aSDI class
Merge branch 'master' into developmental

Conflicts:
	js/main.js