Added tests for end condition for iterator + Added the whole list of TokenTypes
merged with lijuan
Merge branch 'master' into javier
removed bugged doc
Fixed .gitignore conflict
Merge branch 'javier'

Conflicts:
	.gitignore