Time spent abroad
Merge remote-tracking branch 'origin/master'

Conflicts:
	c3/conf/routes
Time spent abroad