Merge branch 'develop' into rails4

.example-env

@@ -0,0 +1,18 @@
+RAILS_ENV=development
+
+AWS_ACCESS_KEY_ID
+AWS_SECRET_ACCESS_KEY
+BUNDLE_GEMFILE
+SMTP_DOMAIN
+SMTP_PASSWORD
+SMTP_PORT
+SMTP_SERVER
+SMTP_USERNAME
+SSO_KEY
+
+## find the ENV currently in use in the app using : 
+##   grep -rIso -P "(?<=ENV)(\.fetch\(|\[).[A-Z_]+.(\)|\])" 
+
+# for a uniq ordered list of env vars:
+##   grep -rIsoh -P "(?<=ENV)(\.fetch\(|\[).[A-Z_]+.(\)|\])" | grep -oP "[A-Z_]+" | sort -u > temp 
+

.gitignore

@@ -6,6 +6,7 @@
 
 realtime/node_modules
 config/database.yml
+.env
 #public/assets
 
 # Ignore bundler config

Gemfile

@@ -14,6 +14,7 @@ gem 'rails3-jquery-autocomplete'
 gem 'best_in_place' #in-place editing
 gem 'kaminari' # pagination
 gem 'uservoice-ruby'
+gem 'dotenv'
 
 gem 'paperclip'
 gem 'aws-sdk'

Gemfile.lock

@@ -72,6 +72,7 @@ GEM
       responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
+    dotenv (2.0.0)
     erubis (2.7.0)
     execjs (2.6.0)
     ezcrypto (0.7.2)
@@ -198,6 +199,7 @@ DEPENDENCIES
   cancancan
   coffee-rails
   devise
+  dotenv
   formtastic
   formula
   jbuilder