fixed issues of merge
Fixed monitoring tests
removed redundent log tests (using tested em log4r)
Updated log. If init is not executed then init will be called on first attemp to log (same behavior as old log)
Merge remote-tracking branch 'origin/testing_prepare_merge_to_master' into testing_prepare_merge_to_master

Conflicts:
	lib/content_data/content_data.rb