Fixed update: v0.5.2.11
Merge branch 'master' of https://github.com/joshepw/Avante-System

Conflicts:
	dashboard/dates_psyco.php