Added simple Jawbone integration functionality
added a user
resolved conflicts