Since when time stamping
Trying again :)
Merge branch 'master-detached'

Conflicts:
	res/layout/splash.xml