Merge pull request #1 from fastplaz/master

synch from master fastplaz
database port
database port @template
Merge pull request #5 from luridarmawan/development

database port
cleanup note & warning
Merge pull request #6 from luridarmawan/development

cleanup note & warning
Merge pull request #7 from fastplaz/development

synch development to master