grades design
Merge remote-tracking branch 'origin/master' into masterr

Conflicts:
	ThinIS/src/main/java/sk/gymdb/thinis/fragment/GradesOverviewFragment.java
Merge remote-tracking branch 'origin/master' into masterr

Conflicts:
	ThinIS/src/main/java/sk/gymdb/thinis/fragment/GradesOverviewFragment.java