edit dikit
trim first
Merge branch 'development'

Conflicts:
	cron.php