Revised abstract.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ubicomp13/abstract/ubicomp.tex