Merge branch 'master' into collection2

Conflicts:
	rpg-docs/client/views/home/home.html

rpg-docs/client/views/home/home.js

@@ -2,10 +2,7 @@ Template.home.events({
 	"click #addCharacter": function (event, template) {
 		Characters.insert(new Character(Meteor.userId()));
 	},
-	"click #nukeCharacters": function(event, template){
-		while(true){
-			if(!Characters.findOne()) break;
-			Characters.remove(Characters.findOne()._id);
-		}
+	"click #delete": function(event, template){
+		Characters.remove(this._id);
 	}
 });