capture.sh: split results by device
Merge commit '91ac3d4'

Conflicts:
	notxw_contacts/app/src/main/java/com/collabora/xwperf/notxw_contacts/fragments/AllContactsFragment.java
	notxw_contacts/perf/src/main/java/com/collabora/xwperf/fps_measure_module/MeasurementLogger.java
Merge remote-tracking branch 'victor/master'

Conflicts:
	notxw_contacts/app/src/main/java/com/collabora/xwperf/notxw_contacts/adapters/CursorFilter.java
	notxw_contacts/app/src/main/java/com/collabora/xwperf/notxw_contacts/fragments/AllContactsFragment.java
update copyright
Merge remote-tracking branch 'victor/master'

Conflicts:
	notxw_contacts/perf/src/main/java/com/collabora/xwperf/fps_measure_module/MeasurementLogger.java
improve capture.sh a little

Conflicts:
	.gitignore
Merge remote-tracking branch 'remotes/simon/master'

Conflicts:
	notxw_contacts/app/src/main/java/com/collabora/xwperf/notxw_contacts/fragments/helpers/AnimatedTabsListener.java