Merge pull request #27 from jorgesilva/develop

Revert "Merge pull request #26 from k22mak/develop"
Changed preference activity class name for framework-issue-237.
Merge branch 'develop' of https://github.com/idrc/tecla-LatinIME into framework-issue-237

Conflicts:
	java/AndroidManifest.xml
Merge pull request #28 from ericwan78/framework-issue-237

Changed preference activity class name for framework-issue-237.
Add original settings app declaration.

Fixes #207 and fixes #227 in tecla-framework project:
https://github.com/idrc/tecla-framework/issues/207
https://github.com/idrc/tecla-framework/issues/227