Necessary code cleaning due to the prior, rushed commit
* Revert re-ask button
* Revert client-side 2 second wait for TMS fire delay (moved to EEG)
* Send trial length on every trial start
Fixed up automatic trial time -> client trial time synchronization (needed a few variable copies)
* Always trigger TMS by the time feedback ends, in our case, we take the closest target if none is hit
* The TMS delay needs to be moved back to the client code
Merge pull request #1 from kaysoky/merging_develop

Pulling changes from origin merging_develop