Android 2 colors is working in activities.
Desktop fixed bugg in DataSource when time expires
Merge origin/master