Error checking on adding menu items
Merge on prev two commits
We were incosistent in which server we were using in the iOS app. defines.h will now define a "serverURL" variable, set depending on whether we are debugging or using the app on production