Fixes Mobile VS Desktop Row Evolution, + adding integration test for this use case. Fixes PR #104
Adding test case + minor test fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/Tracker.php