improving tag checkbox template
Merge branch 'master' of github.com:clocklimited/Catfish
Merge branch 'master' of github.com:clocklimited/Catfish
Merge branch 'master' of github.com:clocklimited/Catfish
Adding new tests
Fixing stubbing and checkbox test
Added model test for assests
Move test stub setup and teardown to before/after mocha fns
Merge branch 'master' of git://github.com/clocklimited/Catfish
Add tests for .retrieve() on article collection
Merge branch 'master' of git://github.com/clocklimited/Catfish
Moving html editor to initialise instead
Merge branch 'master' of github.com:clocklimited/Catfish
Remove duplicate key in schema
Merge branch 'master' of github.com:clocklimited/Catfish
Merge branch 'tagArticle'

Conflicts:
	test/admin/tag/tag-checkbox.test.js
Rename of editView in layout
Merge branch 'master' of git://github.com/clocklimited/Catfish
Updating foreach loop for form html inputs
Merge branch 'master' of github.com:clocklimited/Catfish