more JavaDocs
Merge pull request #2 from kapparulz/master

merge with radu
conflicts handled
Merge branch 'radu-version'
little fix
url and db pass fix
Merge pull request #2 from bancer/master

123