user modesl errors
merge mess
Merge branch 'master' of github.com:eyjolfur12/vf2_sv_5
Merge branch 'master' of github.com:eyjolfur12/vf2_sv_5
Fixed merge issuesin .cproj file and some others