Merge branch 'master' of https://github.com/ongeri/ts-web-1315

Conflicts:
	CFlow/application/controllers/company.php
	CFlow/application/views/bits/leftmenu.php
	CFlow/application/views/forms/registrationform.php
	CFlow/application/views/layouts/basicFrame.php
left menu
form remove extra texts
css on reg form and div enclosure and margin addition on registration
form
Merge branch 'master' of https://github.com/ongeri/ts-web-1315/

Conflicts:
	CFlow/application/views/bits/leftmenu.php
	CFlow/application/views/forms/registrationform.php
Merge branch 'master' of https://github.com/ongeri/ts-web-1315

Conflicts:
	CFlow/application/views/bits/leftmenu.php
	CFlow/application/views/forms/registrationform.php