Merge branch 'master' of https://github.com/cmpham/RSBench

Conflicts:
	src/com/cs598sva/parboil/utils/BenchmarkContentProvider.java
	src/com/cs598sva/rsbench/MainActivity.java