Switched to fixed version number, 2.5
Merge branch 'master' into feature/using-released-version

Conflicts:
	CMakeLists.txt
Merge pull request #11 from ethz-asl/feature/using-released-version

Switched to fixed version number, 2.5