smsTest
Merge branch 'master' of https://github.com/BlueDots/sms

Conflicts:
	sms/WebRoot/database/thomasTest.sql