Merge pull request #1 from abarragan/branch_core_data

Branch core data
Merge branches 'master' and 'master' of https://github.com/abarragan/BondedIn_iOS into branch_core_data