האדר
Merge branch 'master' of https://github.com/rut-cambium/CTC_android
sfhfh
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
עכגךע
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_2.css
Merge branch 'master' of https://github.com/rut-cambium/CTC_android

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