Merge origin/development into development

Conflicts:
	traffic/application/views/welcome_message.php
	traffic/nbproject/project.properties