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
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 pull request #322 from rdsubhas/master

Fix issue with locale "de.yml" in wrong location
merge between #1383 story and i18n features
#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