modified:   server/checkinserver.py
	modified:   server/sequelparse.py
Merge branch 'master' of https://github.com/damiencross/CheckIn
	modified:   server/checkinserver.py
	modified:   server/connhandler.py
	modified:   server/mailer.py