Merge branch 'master' of https://github.com/fatzalore/Banter

                                                                           Conflicts:
                                                                            src/com/example/Banter/BanterRoomFragment.java

Activity set to Portraint only!
Merge branch 'master' of https://github.com/fatzalore/Banter