3.1.1 Release
Merge branch 'master' of https://github.com/ProfBMoriarty/PS3.1

Conflicts:
	aq1.0.3.js