Initial commit of lexer
Merge origin/master

Conflicts:
	src/json/Lexer.java