Merge branch 'hotfix/fix_make_up2' into develop

* hotfix/fix_make_up2:
  fix make_up
remove readme.rdoc
add last_stage_id to user
remove unused helpers
remove unused helpers
add admin/stages.show
edit gitignore
add view of users on this stage
Merge branch 'feature/user_stage_association' into develop

* feature/user_stage_association:
  add view of users on this stage
  edit gitignore
  add admin/stages.show
  remove unused helpers
  remove unused helpers
  add last_stage_id to user
  remove readme.rdoc
remove *.swl files
fix ui
Merge branch 'hotfix/fix_ui'

* hotfix/fix_ui:
  fix ui
Merge branch 'hotfix/fix_ui' into develop

* hotfix/fix_ui:
  fix ui
Merge branch 'release/1.6.2'

* release/1.6.2:
  remove *.swl files
  add view of users on this stage
  edit gitignore
  add admin/stages.show
  remove unused helpers
  remove unused helpers
  add last_stage_id to user
  remove readme.rdoc