Small fixes before first launch
Merge remote-tracking branch 'origin/master'

Conflicts:
	Schema/src/com/schema/bro/ks/Lesson.java
	Schema/src/com/schema/bro/widget/CardWidget.java