[Issue #193] Redid my work after wrong merge into master
[Issue #193] Added documentation
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_C5F2_switch_locales

Conflicts:
	arability/app/controllers/application_controller.rb
	arability/config/routes.rb
[Issue #193] Removed extra lines
[MC]
[MC]
[MC]
[issue#206] managing subscription models
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C3_nohahesham_S05_ChooseSubscriptionModel
noha commited
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C3_nohahesham_S05_ChooseSubscriptionModel
[issue#206]
Merge branch 'C4_m0hamed_C5F2_switch_locales' of https://github.com/MGhanem/smartsoft-13 into C3_nohahesham_S05_ChooseSubscriptionModel
[issue#206]
Merge branch 'master' of https://github.com/MGhanem/smartsoft-13 into C3_nohahesham_S05_ChooseSubscriptionModel
commiting merge conflicts
[MC]
Choose Subscription Model
noha commited managing subscription
noha commited managing subscription