Refactor favorites into ArrayList

Now supports unlimited number of favorites!
Fix git errors
Fix logic error in adding server
Merge pull request #335 from Wetmelon/master

Unlimited favourites!