Merge branch 'master' of
https://buakg100@github.com/buakg100/photomanipulator.git
Merge branch 'master' of
https://github.com/buakg100/photomanipulator.git