[MC] Salma merged her branch with rolling master
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into rolling_master
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into rolling_master
changed the order of the javascript includes
Merging share and remove
pushing javascript settings fix
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C2_Mirna-Yacout_C2S2_connectToTwitter
[issue#204][issue#207] share and remove done
sliding views
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into rolling_master
[issue #170] [WIP] adds backend for suggesting synonyms
[Issue #186] [WIP] fixed views, fixed functionality of choose words, added synonyms to choose_keywords view
[Issue #208][WIP] Salma arabized show project
[issue #186] [NW] undid changes in controller
[MC] Salma merged create in project
[issue#206] managing subscription models
Merge branch 'rolling_master' of https://github.com/MGhanem/smartsoft-13 into rolling_master
[issue #210] [NW] changed view to arabic
Merge branch 'C3_fattouh92_S16_viewProjectsSharedWithMe' of https://github.com/MGhanem/smartsoft-13 into C3_fattouh92_S16_importCSV
[issue #186] [NW] fixed something wrong in index view of projects after pull