updated projects and pull latest cocoalumberjack
Merge branch 'riseup-branch' of github.com:LittleJoySoftware/ljs into riseup-branch

Conflicts:
	Tests-MacOS/Makefile
	Tests-iOS/Tests-iOS.xcodeproj/project.pbxproj