adding getBlock and getLatestBlock methods
version bump
adding getBlockByHeight method, and updating getBlock to getBlockByHash
Height is an NSInteger not an NSInteger*
fixing merge conflict
Merge branch 'getBlock'