Commit from andrews git to github.
Merge branch 'master' of git://github.com/ddipasquo/qhmobile

Conflicts:
	qhweb/qhmobile/models.py
	qhweb/qhmobile/models.pyc