update
Merge branch 'master' of https://github.com/szabcsee/sangha-supporter
Merging view and rails 4.0.2 update changes
Show view and conditional editing is developed