Shall I be in conflict
Merge branch 'master' of
https://github.com/WycliffeIndia/WycliffeIndia.git

Conflicts:
	LiteracyApp/src/org/wycliffeindia/literacyapp/MainActivityAlphabet.java