Issue #216 Removed Gemfile.lock
Issue #216 Fixed conventions
Merge branch 'C5_Khaled_130_add_user_authentication_advanced_5.9_5.11_5.12_5.16' of https://github.com/alaashafaee/Coolsoft-14 into C5_Khaled_130_add_user_authentication_advanced_5.9_5.11_5.12_5.16