Periodical commit.
Merge branch 'develop'

Conflicts:
	logging_functions.cc