something is wrong with notifications in user_show
mailing list 90% finnished
s
Merge branch 'mailinglist'

Conflicts:
	script/generate_hash.sh
Merge branch 'master' of http://github.com/speedy901990/web-svn