Fixed javascript for formula generation
Merge branch 'master' of https://github.com/ch3ck3r/mathetest
Merge branch 'master' of https://github.com/ch3ck3r/mathetest

Conflicts:
	htdocs/js/task.js