Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/emotion/sintactico/SintacticAnalizer.java
	src/com/emotion/utilities/ReadFile.java