Fixes a part of #279.#399

octacode wants to merge 2 commits into

BuildmLearn:bug-fixesBuildmLearn/BuildmLearn-Toolkit-Android:bug-fixesfrom

octacode:hardcoded_stringsoctacode/BuildmLearn-Toolkit-Android:hardcoded_stringsCopy head branch name to clipboard