Merge branch 'master' of https://github.com/seker/monitor

Conflicts:
	res/layout/process_list_item.xml
	src/seker/monitor/MonitorActivity.java
	src/seker/monitor/process/ProcessInfo.java
Merge branch 'master' of https://github.com/seker/monitor

Conflicts:
	res/layout/process_list_item.xml