Switched to 2.0.5
Merge branch 'master' of https://github.com/wavesoft/cernvm-webapi

Conflicts:
	src/platform/unix/main.cpp