update
Merge branch 'master' of https://github.com/maitv/ProjectSem1

Conflicts:
	source/css/jquery-ui.css
	source/js/common.js
	source/mainpage.html
	source/test.html