merge before switching to base repo
Merge branch 'master' of https://github.com/maxwen/performance-tool

Conflicts:
	res/layout/gpu_settings.xml
	src/info/corne/performancetool/statics/FileNames.java