whitespace cleanup .gitattributes
Merge branch 'linux_dr_refactor_phase001_whitespace' into linux_dr_refactor_phase002_consistantSyntax
Merge branch 'linux_dr_refactor_phase002_consistantSyntax' into linux_dr_refactor_phase003_renameVars
Merge branch 'linux_dr_refactor_phase003_renameVars' into linux_dr_refactor_phase004_cleanupComments
Merge branch 'linux_dr_refactor_phase004_cleanupComments' into linux_dr_refactor_phase005_move3rdPartyCode
Merge branch 'linux_dr_refactor_phase005_move3rdPartyCode' into linux_dr_refactor_phase006_setupJasmine
whitespace cleanup
Merge branch 'linux_dr_refactor_phase006_setupJasmine' into linux_dr_refactor

Conflicts:
	test/test.html
fixed script tags
Merge branch 'linux_dr_refactor_phase006_setupJasmine' into linux_dr_refactor

Conflicts:
	test/test.html