* add some extraneous whitespace to make jenkins unhappy
* undo test whitespace change
* more testing with too much whitespace
* revert whitespace change again
* add new defaults to jenkins_buttonmen build template
Merge branch 'master' of github.com:buttonmen-dev/buttonmen into 1135_jenkins_yellow
ids are now created explicitly rather than by auto-increment
fixed some sql errors
got rid of NULL set_id problem
changed buttonids in dummy api responder
fixed a problem with test_Api.js
update for schema - still buggy
updated schema to include named constraints
Added more information to error message for ambiguous default attack
Added extra text to make message clearer
Added full stop to message.
Changed reroll behaviour so that dice only reroll once per turn
Dealt with PMD warning
Merge pull request #1297 from ManvilleFog/1286_explicit_ids

1286 explicit ids
* unsuccessful and successful trip attacks