Merge branch 'master' of github.com:buren/test into max

Merge.
Merge branch 'wahtb' of github.com:buren/test into user_login
u
hm