Attempt to fix #261 and fix #163
Merge branch 'develop' of https://github.com/idrc/tecla-framework into develop

Conflicts:
	java/src/ca/idrc/tecla/highlighter/TeclaHighlighter.java
	package/tecla/addon/TeclaAccessibilityService.java
Merge pull request #312 from jorgesilva/develop

Develop