fds
Merge branch 'master' of https://github.com/gargamelrr/milab_2014

Conflicts:
	js/scripts.js
fd