Merge branch '12-16-14'

Conflicts:
	SuBdraft-11.23.aux
	SuBdraft-11.23.bbl
	SuBdraft-11.23.blg
	SuBdraft-11.23.log
	SuBdraft-11.23.out
	SuBdraft-11.23.pdf
	SuBdraft-11.23.synctex.gz
	SuBdraft-11.23.tex