Changed (I think)

I have no idea what the flunk I'm doing.
Working commit.
Merge branch 'master' of https://github.com/Anthoknee/jaams-web

Conflicts:
	README.md
	application/localization/error_msgs.php
	application/models/Base.model.php
	core/Documentation/Base_Controller.htm
	core/Documentation/Debugger.htm
	core/models/Base.model.php
	core/utilities/Debugger.class.php
	core/utilities/functions.php
	forms/Documentation/Base_Controller.htm
	forms/Documentation/Fieldset.htm
	forms/Documentation/Form.htm
	forms/Documentation/Input.htm
	forms/controllers/Fieldset.class.php
	forms/controllers/Form.class.php
	forms/controllers/Group.class.php
	forms/controllers/Input.class.php
	forms/controllers/JAAMSForms_Input.class.php
	forms/models/Base.model.php
	index.php