trouble with branch
resolve conflict
Merge pull request #20 from var-bin/dev-20130527-rybka_auth_admin

Dev 20130527 rybka auth admin