fixed startup fail bug
Merge branch 'sammyh' of https://github.com/lancehc/WatsonSID into sammyh

Conflicts:
	mobile/src/main/java/com/watsonsid/activities/watsonsid/SampleDispatchActivity.java
fixed mergy problems