fix rdoc
fix DEPRECATION WARNING
Merge branch 'travis-ci' into feature/people_edit
refactoring
done
done
done
refactoring
refactoring
refactoring
organization edit done
refactoring
Merge branch 'feature/people_edit' into feature/org_edit
refactoring test
fix test
fix template && test
fix template && test
Merge branch 'feature/people_edit' into feature/org_edit
org edit done