Solved the @Override error of eclipse
Merge branch 'autotext' into tito