Merge branch 'origin/dev.timothy.chandler'
fixed the semi colon in the wrong place
updated ref
added new logic to the login function
removed _wysiwyg
updated config for image upload
Merge branch 'origin/feature.rest'

Conflicts:
	model/Node.php
Updated model.
Fixed dodgy merge.
Fixed missing $offset and $limit.
Renaming WYSIWYG for the 100th time.
Rename
Renamed.
Fixed warning being thrown for empty regular expression.
Removed debug code.
Updated my config.
Updated model.
Updated SMS model.
Added hooks for content forms.
changed the volume from varchar to int