simulating-conflict-B
Merge branch 'Automated_Test_Reporting' into simulating-conflict-B

Conflicts:
	XBlockr/src/com/xblockr/ui/HomeActivity.java
Merge pull request #12 from Vivek-Tomar/simulating-conflict-B

simulating-conflict-B