page layouts redesigned
Merge branch 'master' of https://github.com/telephonebilling/tbs

Conflicts:
	tbs/src/main/webapp/pages/registration.xhtml
conflict resolved