Merge pull request #127 from lukashaertel/master

Setup of new paths, velocity and settings
Settings view
Settings behaviour adjusted, no strings used, just for SPS names, should redo that as well
Fixed #114. This time hopefully doing the correct push command.
Merge remote-tracking branch 'upstream/master'
Merged and merged
Upload address
Merge pull request #134 from lukashaertel/ft2upload

Fieldtrial pull request after merge