Changed $.animator from a function to a normal jQuery object, otherwise one could create multiple animators possibly resulting in clashing animation declarations.

Signed-off-by: Arné Schreuder <arn3@arn3.com>
Resolved some merge conflicts
Merge origin/master

Conflicts:
	jquery.animator.js