Merge pull request #16 from KevinHuebner/master

Random password generator
Merge pull request #7 from cbos-team/master

random password generator
Merge pull request #17 from KevinHuebner/master

Model and table in HSQLDB  for "Module" created
CBOS-19 fixed admin login page
Merge branch 'master' of https://github.com/cbos-team/cbos

Conflicts:
	src/main/webapp/WEB-INF/pages/admin/home.jsp
Merge pull request #4 from cbos-team/master

CBOS-19 fixed admin login page