login page
Prior to merge with Mitto
phpexcel
login page
accidentally deleted
accidentally deleted
accidentally deleted
pulling..
Merge commit '02ec57c11e9c875f80910cad7598aed333f9a57f' into develop

Conflicts:
	application/libraries/PHPExcel
	dbv
Merge remote-tracking branch 'shohiek/login_page' into develop

Conflicts:
	phpexcel
login footer
Merge branch 'develop' of https://github.com/MwangiKevin/web-lims into develop

Conflicts:
	application/libraries/PHPExcel
	application/libraries/PHPExcel/Classes/PHPExcel/Calculation/functionlist.txt
	application/libraries/PHPExcel/Classes/PHPExcel/Chart/Renderer/PHP Charting Libraries.txt
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/JAMA/CHANGELOG.TXT
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/JAMA/EigenvalueDecomposition.php
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/JAMA/SingularValueDecomposition.php
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/JAMA/utils/Error.php
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/OLE/PPS.php
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/OLE/PPS/File.php
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/PCLZip/gnu-lgpl.txt
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/PCLZip/pclzip.lib.php
	application/libraries/PHPExcel/Classes/PHPExcel/Shared/PCLZip/readme.txt
	dbv
Merge remote-tracking branch 'mitto/develop' into develop

Conflicts:
	dbv
module updates
Merge branch 'develop' of https://github.com/MwangiKevin/web-lims into develop

Conflicts:
	application/libraries/PHPExcel