Merge branch 'master' of https://github.com/swt14w01/Orga.git
update #6.1 & 6.2
Merge branch 'master' of https://github.com/swt14w01/Orga.git