Closes #17
Merge branch 'master' into 2.0

Conflicts:
	app/controllers/advantage/admin/DrawController.php