Merge pull request #7 from cbos-team/master

random password generator
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