Survey Issue #13 - Fix branch merging problems and generators logic
- Fix merging inconsistencies between master and add-rails-4-strong-parameters-support
- Fix generator parameters when the namespace is empty