fixed bug where current_user.id would be accessed without first checking whether there was a user logged in
Merge branch 'master' of github.com:gatala/calapps