Added drawer items
Added Performance Activity
Bugfixing
Merge branch 'master' of https://github.com/smcv/xw-perf

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/adapters/INavItem.java
	notxw_contacts/app/src/main/res/values/colors.xml
	notxw_contacts/perf/src/main/java/com/collabora/xwperf/fps_measure_module/MeasurementLogger.java
Merge remote-tracking branch 'victor/master'

Conflicts:
	notxw_contacts/perf/src/main/java/com/collabora/xwperf/fps_measure_module/MeasurementLogger.java