Merge branch 'master' into feature/disable_account

Conflicts:
	users/app/controllers/users_controller.rb
	users/app/helpers/users_helper.rb
	users/app/views/users/edit.html.haml
	users/app/views/users/show.html.haml
	users/config/locales/en.yml

1 files changed, 7 insertions, 1 deletions

diff --git a/DEVELOP.md b/DEVELOP.md
index 9548774..e19b827 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -1,5 +1,11 @@
 # Development #
 
+## Hacking ##
+
+Some tips on modifying the views:
+
+* Many of the forms use [simple_form gem](https://github.com/plataformatec/simple_form)
+
 ## Engines ##
 
 Leap Web consists of different Engines. They live in their own subdirectory and are included through bundler via their path. This way changes to the engines immediately affect the server as if they were in the main `app` directory.
@@ -37,7 +43,7 @@ require File.expand_path('../../lib/leap_web/version.rb', __FILE__)
 # ...
   Gem::Specification.new do |s|
     # ...
-    s.add_dependency "rails" 
+    s.add_dependency "rails"
     s.add_dependency "leap_web_core", LeapWeb::Version
   end
 ```