merge
Merge branch 'master' of https://github.com/wala/WALA

Conflicts:
	com.ibm.wala.core/.classpath
Merge branch 'master' of https://github.com/wala/WALA
new helper method
fix for annyoing \r\n newline issues in text from html files
move to Reader API to help with annoying /r/n issues is source mapping
bug fixes for source buffers when the source files is all on a single
line