jhj
iuMerge branch 'master' of github.com:NickSchurgers/Cakephp-DialogHelper-Plugin

Conflicts:
	.idea/workspace.xml