Akash - #1494 - allow user to have no roles when they are unverified
Subhash/Faris : Fixed replication test.
Faris [#translation]
- Added translation for "Disabled" in users table header.
Merge branch 'master' of https://github.com/rapidftr/RapidFTR

Conflicts:
	config/routes.rb
	spec/controllers/users_controller_spec.rb
[Refactor/Fix] Yekkanti/Kavitha Made https scheme to work
Subhas | Update Travis build status image
Faris [#translation]
- Added translation for flash_notice in user_preferences_controller.
- Added method translated_permissions in application_helper.
- Modified translation files by adding permissions.
- Fixed the drop-down list on roles page.
Faris [#translation]
- Fixed header of create role page.
[#1512] Subhash/Faris: Added functional test to change password story.
[#1513] Yekkanti|Kavitha Changed the couhdb configuration such that it can create/use the authenticated cocuhdb
merged
[#1522] Faris: Added translation for change_password notifications.
[#1522] Faris: Modified view/role/new so it has roles in arabic.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR

Conflicts:
	public/javascripts/translations.js
[#1513] Yekkanti|Kavitha - Authenticate server credentials for synchronization
[#1522] Faris: Cleaned up the code.
Merge branch 'master' of git://github.com/rapidftr/RapidFTR
Merge branch 'installer' of git://github.com/sumitmah/RapidFTR into sumitmah-installer

Conflicts:
	Gemfile.lock
Merge pull request #334 from farismosman/master

[#1512] Users without 'create & edit user' permission cannot change password
[#1513] Yekkanti|Kavitha Enabled authentication for fetching the target database urls. Changed the way the target urls would be returned