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

Conflicts:
	Resources/main_windows/question_swipe.js
functions!