splash changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	App/src/com/osu/cleanandsobertoolboxandroid/SplashScreenActivity.java
Merge remote-tracking branch 'upstream/master'
updated message format
text update
updated message format
Merge pull request #21 from nitishjindal/master

removed the data.java file