update
Merge branch 'master' of https://github.com/nhanvtran/SubstrAna

Conflicts:
	Summer14/bin/BuildFile.xml