Merge branch 'master' of github.com:buttonmen-dev/buttonmen
Merge branch 'master' of github.com:buttonmen-dev/buttonmen
Merge branch 'master' of github.com:buttonmen-dev/buttonmen
* add a test of the doppelganger twin failure
Fixed BMDieTwin->roll() to only set value once both subdice have been
rerolled
Merge remote-tracking branch 'cgolubi1/1367_reproduce_bug' into 1367_doppelganger_fail
Tailored responder unit test so that it passes
Unsuccessful trip attacks by null dice now do not impart null
Added responderTest to confirm that unsuccessful trip attacks by null dice do not impart null
Removed unused comment
Merge pull request #1369 from blackshadowshade/1362_null_trip

Null dice do not impart null on unsuccessful attack
Merge remote-tracking branch 'upstream/master' into 1367_doppelganger_fail

Manually resolved conflicts in:
	test/src/api/responderTest.php
Merge pull request #1368 from blackshadowshade/1367_doppelganger_fail

Fixed doppelganger bug when cloning twin dice
Merge pull request #1370 from buttonmen-dev/master

pull changes from master to dev on 2014-10-25