Mai & Anoop: Story 1126: rename Field.enabled to Field.visible
Mai & Anoop: Story 1126: rename Field.enabled to Field.visible
Story 1126: fix some text in comment that was renamed by mistake
fix merge conflict
#1222 Added photo upload box as a custom field
#1228 Ashok|Kavitha Added ability for users to set default language
#1228 Ashok|Kavitha Added spec for setting the default locale
Fix - Ashok - Fixed the specs
FIX - Ashok - Added therubyracer gem for I18n gem issue
#1228 - Ashok/Kavitha - Added set language under system settings for admin
Revert "#1222 Added photo upload box as a custom field"

This reverts commit 9952af17053d793c962bff6e1310e845b53170e8.
cg - #1126 - resolving some merge conflicts and removing some unnecessary changes
cg - #1126 - more replacing of enable / disable
cg - #1126 - two users exist here so making sure it picks up the right one now
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