Merge remote-tracking branch 'origin/Olege_2013_06_25'

Conflicts:
	ILost/src/com/zirteam/ilost/SplashScreenActivity.java