added current_user var available to all views, redefined some things in User library, midified some views
fixed merge conflicts