a
Merge branch 'master' of https://github.com/Saronet/CTC_RU
Merge branch 'master' of https://github.com/Saronet/CTC_RU
yanai is on the MAC!!!
Merge branch 'master' of https://github.com/Saronet/CTC_RU

Conflicts:
	www/css/StyleSheetSmall.css
34
erwew
Merge branch 'master' of https://github.com/Saronet/CTC_RU
ד

ד
aa
Merge branch 'origin/master'

Conflicts:
	www/css/StyleSheet.css
	www/css/StyleSheetBig.css
	www/css/StyleSheetSmall.css
	www/index.html
	www/js/managers/Navigation_Manager.js
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
ש
Merge branch 'origin/master'
Merge branch 'origin/master'