Merge remote-tracking branch 'origin/devleop' into devleop

Conflicts:
	src/com/acctrue/tts/GlobalApplication.java
	src/com/acctrue/tts/activity/SplashActivity.java