Lots of comments
Merge branch 'master' of https://github.com/alexggordon/GQUIP

Conflicts:
	add_software.php
	authenticate.php
	config.php
	csv_import.php
	dateTime.php
	departments.php
	edit_item.php
	edit_license.php
	edit_software.php
	faculty.php
	faculty_info.php
	footer.php
	fpdf.php
	getPage.php
	header.php
	home.php
	info.php
	login.php
	logout.php
	new_item.php
	new_software.php
	offline_admin_login.php
	offline_faculty_login.php
	offline_user_login.php
	open_db.php
	page_template.php
	paginate.php
	pdfprint.php
	search.php
	software.php
	stats.php
	student_info.php
	students.php
	symbolic_values.php