test
Merge branch 'master' of https://github.com/jeremymcwilliams/Sets

Conflicts:
	SetsPlugin.php
	controllers/AjaxController.php
	controllers/MysetsController.php
	helpers/functions.php
	views/public/css/sets.css
	views/public/javascripts/view-set.js
	views/public/mysets/sets.php
	views/public/mysets/view-set.php
	views/shared/common/showPage.php