porting master to release

@Praburaj @glennc 

Porting master to release since it was behind in terms of commits. Will be adding more updates to release branch later and merging to master for beta2
I don't think it requires admin privileges because it only installs for the current user. You might get an error but everything works... (I run with UAC on)