Merge remote-tracking branch 'origin/master'

Conflicts:
	Database SQL file/database.sql
	Images/Untitled-3.psd
	Images/bc.png
	index.php
	read.php
	readFin.php
	readPro.php
	updateFinacial.php
	updateProgram.php