updates htdocs.qrc to include img/user.png
fixed small bug in windows setup file
merge again