Merge remote-tracking branch 'origin/master' into round_clock_testing

Conflicts:
	lib/content_data/content_data.rb
	lib/log/log_consumer.rb
Merge remote-tracking branch 'origin/master' into round_clock_testing

Conflicts:
	lib/content_data/content_data.rb
	lib/log/log_consumer.rb
Merge with latest + fix namespace + fix filegen + config file for filegen.
Fixed file log consumer
Small Email gem. Testing Gem. Testing server basic version.
Update gemspecs
Merge remote-tracking branch 'origin/master' into round_clock_testing

Conflicts:
	lib/params.rb
	validations.gemspec
Added limit on file generation.
Small fix.
Files may not be unique.
Example and email small fix.
log4r in Testing server + expection + signal handling. Email will be send on error.
Merge branch 'master' of https://github.com/kolmanv/bbfs
small fixes
Set email log level to error and above.
Fix fetch/save remote content.
Added testing server locally on same machine
Added testing server locally on same machine
removed file as part of log infrastructure change to log4r
Updated file as part of log infrastructure change to log4r