Code Refactor

Issue #348
Merge branch 'issue-351' into issue-348

Conflicts:
	package/tecla/addon/TeclaSettingsActivity.java