Merge branch 'development' of github.com:unlucio/RestKit into development