Commit
Merge branch 'master' of github.com:alejandrovze/MS

Conflicts:
	Resources/main_windows/question_swipe.js
Updating.
Merge branch 'master' of github.com:alejandrovze/MS