Began work on report Builder WKB
reportBuilder - Misc changes to save before I switch branches WKB
Merge branch 'dev' into reportBuilder
Audited materials, and rearranged folder contents so that important source files aren't so difficult to reach, a note about the git add  though, warning: LF will be replaced by CRLF in source code/BitSlice.py.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/RunSite.bat.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/jquery/jquery.cycle.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/jquery/jquery.js.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/power_decoder/BitSli
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/static/jquery/jquery
ll.js.
The file will have its original line endings in your working directory.
warning: LF will be replaced by CRLF in source code/static/jquery/jquery
The file will have its original line endings in your working directory.
removed deleted files
made dictionary work WKB
Merge branch 'sjarnag-StephenDev' into reportBuilder-Stephen

Conflicts:
	source code/BitSlice.py
	source code/DataLinkTranslator.py
	source code/power_decoder/dictScriptV2.py
updated script and tests to reflect new dict return
checked scripts, testing and scripts were okay but the data file had a additional unicode attachment, sovled this through the encoding option in notepad ++, selected the option unicode 8 without BOM.
implemented file upload feature. AH