Testing Ticket #1494
Testing Ticket #1493
1493 gets a lot of testing!
Yet one more 1493 test
Testing binary file viewing (Ticket #1502)
Keep testing various binary files
Removed binary files from Ticket #1502 testing
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'

Conflicts:
	NewFile_JRN_20130709-1602.txt
This is the second version of this file
Merge remote-tracking branch 'origin/jrn_7'