changing the listing of roles, that can be ascending or descending
#1383 - Alabe - Changing the listing of roles, that can be ascending or descending
#1383 - Alabe - Changing the listing of roles, that can be ascending or descending
#1383 - Alabe - Changing the listing of roles, that can be ascending or descending
#1383 - Alabe - Changing the listing of roles, that can be ascending or descending
merged from upstream
merge between #1383 story and i18n features
merging #1461 Clicking on Save Order for Fields not working-Defect Fixed
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Merge branch 'master' of https://github.com/alabeduarte/RapidFTR into pull-req-323

Conflicts:
	public/javascripts/translations.js
Akash - merging #1383 Changing the listing of roles, that can be ascending or descending
RapidFTR #1441 (Sumit/Nazneen) fixed the defect
Merge remote-tracking branch 'upstream/master' into profile_thumbnails
1469 | Subhas | Updated Gemfile to prevent Windows installers from checking in
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
RapidFTR (Sumit/Nazneen) Removing the dead code.
Merge remote-tracking branch 'upstream/master' into profile_thumbnails
Faris - [#1466] Modified method init in application.js by adding a click on restore image button and waiting time when browser.webkit is true.
Merge branch 'master' of https://github.com/rapidftr/RapidFTR
Merge pull request #327 from farismosman/master

[#1466] Rotate buttons on edit photo works only on 2 clicks