Applied Andreas's comments
Merge branch 'master' of https://github.com/saeedzr/SSDBM2014

Conflicts:
	sig-alternate.aux
	sig-alternate.log
	sig-alternate.pdf
	sig-alternate.synctex.gz
	sig-alternate.tex