Merge remote-tracking branch 'CJ/master'
re-up
form edits (still fully functional)
add multicheckbox support.
Mvc library , initial commit
Merge pull request #3 from haywars/master

no changes
Merge branch 'cj/master'

Conflicts:
	emagid.php
	includes/functions.inc.php