Bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Schema/src/com/schema/bro/LessonActivity.java
	Schema/src/com/schema/bro/MainActivity.java