* Changes the direction of cursor movement to along the x-axis
* Adds a re-ask button on the client side
* Misc code cleanup
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
Updated the "yes"/"no" text position, so that it's now at the bottom of the screen.

Conflicts:
	src/contrib/Application/Brain2Brain/Brain2Brain.cpp
Merge pull request #1 from kaysoky/merging_develop

Pulling changes from origin merging_develop
Made targets become yellow when a forced decision is made at the end of a trial.  Added a message telling a forced decision was made to the AppLog.
Merge pull request #6 from DLos/newEdit2

Forced Choice Target Color change
Added comments and made code easier to read
Merge pull request #7 from DLos/newEdit2

Made code easier to read
Added CSV stimuli files, removed feedback to the TMS subject and changed the question back to did you see a flash of light
Merge pull request #8 from DLos/newEdit2

Added CSV files, removed reviever alert, Reverted back to generic question.
Applog now reports the intenisty at which the TMS fires
Applog now reports the intenisty at which the TMS fires
Merge pull request #2 from kaysoky/merging_develop

Updating my copy
Fixed format of CSV files
Merge branch 'newEdit2' of https://github.com/DLos/NeuralSystemsBCI2000 into newEdit2
Changed capitalization of RGB color "Yellow". The previous all caps version of YELLOW was not recognized and caused errors during the build.

Signed-off-by: j-cronin <jeneva.cronin@gmail.com>
Merge branch 'merging_develop' of https://github.com/j-cronin/NeuralSystemsBCI2000 into merging_develop