fix
Merge branch 'master' of github.com:petternorman/v_ift_API

Conflicts:
	v_ift/Bootstrap/Bootstrapper.cs