Min
Merge branch 'master' of https://github.com/geirskoglund/trace.git

Conflicts:
	Trace/res/values/strings.xml