Empty test project
empty test project
Merge branch 'master' of https://github.com/xChrisPx/ProjectR_Android
..

...
Merge remote-tracking branch 'origin/Christoph'