Merge branch 'master' into feature-custom-buffs

# Conflicts:
#	rpg-docs/client/views/character/inventory/itemDialog/itemDialog.html
#	rpg-docs/client/views/character/spells/spellDialog/spellDialog.html

rpg-docs/lib/functions/evaluate.js

@@ -49,6 +49,12 @@ evaluate = function(charId, string, opts){
             if (list && list.saveDC){
                 return evaluate(charId, list.saveDC);
             }
+        }
+        if (spellListId && sub.toUpperCase() === "ATTACKBONUS") {
+            var list = SpellLists.findOne(spellListId);
+            if (list && list.attackBonus){
+                return evaluate(charId, list.attackBonus);
+            }
         }
 		return sub;
 	});