added loading bar to twitter OAuth web view. Made the method that checks for twitter api connectiviy run in a thread for newer android versions.
fixed merge conflicts