Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php
Merge branch 'master' of github.com:cleverness/cleverness-to-do-list-plugin

Conflicts:
	includes/cleverness-to-do-list.class.php
	includes/cleverness-to-do-loader.class.php