increased heap to 3000
adjusted includes (ble_error.h has to be included after handlers.h otherwise the APP_CHECK_ERROR macro will be overwritten by the default nordic version)
(almost) all services and characteristics enabled
Merge remote-tracking branch 'upstream/master'