UserOptions now insists on all parameters being passed.
UserOptionEngine is complete.
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/classes/userOptionEngine.php
Merge remote-tracking branch 'origin/master'
Removed an extra [] when adding blocks to the block array to remove the blocks.main.{number}.title problem. now it's just blocks.main.title. I see no reason to have multiple content in the same block region
Added addModule, AddPermission, and AddOption functions
Merge remote-tracking branch 'origin/master'