pushing javascript settings fix
Merge branch 'rolling_master' of http://github.com/MGhanem/smartsoft-13 into rolling_master
Merge branch 'rolling_master' of http://github.com/MGhanem/smartsoft-13 into rolling_master
Merge branch 'rolling_master' of http://github.com/MGhanem/smartsoft-13 into rolling_master
arabisation -mostafa
Merge branch 'rolling_master' of http://github.com/MGhanem/smartsoft-13 into rolling_master