fixing bugs in controls class
Merge branch 'master' of https://github.com/curtis-h/agile

Conflicts:
	agile/controls.class.php