Merge branch 'master' of github.com:mtcld/Server-0.1
Update README.rdoc

Edited by Lex
Update README.md

Edited by Lex
refactoring codes
Merge branch 'master' of https://github.com/mtcld/Server-0.1
Merge branch 'master' of github.com:mtcld/Server-0.1
refactor registration_controller.rb
merge with master and resolve conflict on registration_controller.rb
Merge pull request #1 from mtcld/createUserDirectory

Create user directory
Merge branch 'master' into user-type-and-upload-log
add belongs to