Version 05.006 (11.02.2014)
Version 05.006 (11.02.2014)
Merge branch 'master' into test-FAN

Conflicts:
	temp_data/cache/service_data/.gitignore