Some updates

Udates prior Monthly View update
Merge branch 'master' of https://github.com/kidojunior/bwa

Conflicts:
	protected/views/departmentproductioninfo/admin.php
	protected/views/staff/_charts.php
git push