(Menu stuff - but commented out currently)
Merge branch 'develop' of github.com:flypay/gbk_iOS into develop
Fixed to match Ben's library changes