update contributors' list in credits.rtf
Merge branch 'develop'
MISC use newer version of OakImageAndTextCell which fixes an issue with Retina displays
MISC update podfile
MISC update cocoapods version for travis
MISC update macvim
#93 restructure menu items in xib
#93 restrucuture menu