Trace log changed
Merge remote-tracking branch 'origin/master'

Conflicts:
	ASMechanics.Website/App_Data/Logs/UmbracoTraceLog.txt