Creating rewrite branch
More changes
Grunt stuff
fix issue with window size
reorganising
solution file
Finalise installer
Merge branch 'master' into rewrite