Fix the current_user bug
merge development to heroku