Rest Api
Merge branch 'master' of github.com:kstasik/tracking

Conflicts:
	src/System/TrackingBundle/Tests/RestApiTestCase/DeviceTest.php