17 commit
test_1 commit
Merge branch 'test'

Conflicts:
	www/static/js/jquery/effect.js
18 commit