Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S12_api
[Issue #363][NW] simple views with simple controller
[Issue #363][WIP] working api but no translation or help
[Issue #363][WIP] translated the views and started on the help page
[Issue #363] Finished help in english
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S12_api

Conflicts:
	arability/Gemfile
	arability/app/assets/stylesheets/bootstrap-rtl-overrides.css.scss
	arability/app/assets/stylesheets/bootstrap_and_overrides.css.scss
	arability/lib/tasks/populate.rake
[Issue #363] Added docs
Merge branch 'master' of github.com:MGhanem/smartsoft-13 into C4_m0hamed_S12_api
[Issue #363] Fixed translation
[Issue #363] Fixed code according to guidelines
[Issue #363] fixed spelling error
[Issue #363] Added uml
[Issue #363] fixed umls
[Issue #363] fixed code conventions
[Issue #363] fixed scenario comments
Merge remote-tracking branch 'origin/master' into C4_m0hamed_S12_api

Conflicts:
	arability/Gemfile
	arability/app/assets/stylesheets/bootstrap-rtl-overrides.css.scss
	arability/app/assets/stylesheets/bootstrap_and_overrides.css.scss
	arability/lib/tasks/populate.rake
Merge pull request #463 from MGhanem/C4_m0hamed_S12_api

C4 m0hamed s12 api