Testing binary file viewing (Ticket #1502)
Keep testing various binary files
Removed binary files from Ticket #1502 testing
Create different remote updates, for testing #1450
Merge branch 'origin/master'
Ticket #1450 testing takes a while.
Merge branch 'origin/master'
A different file is needed for Ticket #1450
Merge branch 'origin/master'

Conflicts:
	NewFile_JRN_20130709-1602.txt
This is the second version of this file