Merge branch 'release/0.6.3' into dev
Merge branch 'hotfix/0.6.4' into dev
Update README.rst

Added ms windows installation instructions
Merge branch 'dev' of https://github.com/Suberri/open-shot into moshe-dev

Conflicts:
	README.rst
Adding 'Register' in top menu, fixing #148
Fixing avatar sizes, #144
fixing the link on activation page
Adding NUIS as a partner
Improving registration redirect, #83
Easier question editing, fixing #166
Locking candidate status, #145
version
Merge branch 'release/0.6.5'