כעלכע
גהדג
Merge branch 'master' of https://github.com/rut-cambium/CTC_android
כה
Merge branch 'master' of https://github.com/rut-cambium/CTC_android

Conflicts:
	assets/www/css/andrd_small.css
Merge branch 'master' of https://github.com/rut-cambium/CTC_android

Conflicts:
	assets/www/css/andrd_small.css
ש
Merge branch 'master' of https://github.com/rut-cambium/CTC_android
מועדפים
Merge branch 'master' of https://github.com/rut-cambium/CTC_android